From 3346fb52e3aeea2c0b68bf52b4369fbb7cbfcbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Wed, 21 Oct 2009 20:00:40 +0000 Subject: [PATCH 1/6] Initial import. --- .cvsignore | 1 + filterutil-separate-module.patch | 13 + filterutil-style-bugfix-zikula-trunk.patch | 348 +++++++++++++++++++++ import.log | 1 + sources | 1 + zikula-module-filterutil.spec | 56 ++++ 6 files changed, 420 insertions(+) create mode 100644 filterutil-separate-module.patch create mode 100644 filterutil-style-bugfix-zikula-trunk.patch create mode 100644 import.log create mode 100644 zikula-module-filterutil.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fd6c3d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +filterutil-0.tar.bz2 diff --git a/filterutil-separate-module.patch b/filterutil-separate-module.patch new file mode 100644 index 0000000..1dcbe54 --- /dev/null +++ b/filterutil-separate-module.patch @@ -0,0 +1,13 @@ +Index: filterutil-0/FilterUtil.class.php +=================================================================== +--- filterutil-0.orig/FilterUtil.class.php ++++ filterutil-0/FilterUtil.class.php +@@ -13,7 +13,7 @@ + /** + * Define Class path + */ +-define('FILTERUTIL_CLASS_PATH', 'includes/pnobjlib/FilterUtil'); ++define('FILTERUTIL_CLASS_PATH', 'config/classes/FilterUtil'); + + Loader::loadClass('FilterUtil_Plugin', FILTERUTIL_CLASS_PATH); + Loader::loadClass('FilterUtil_PluginCommon', FILTERUTIL_CLASS_PATH); diff --git a/filterutil-style-bugfix-zikula-trunk.patch b/filterutil-style-bugfix-zikula-trunk.patch new file mode 100644 index 0000000..26309c4 --- /dev/null +++ b/filterutil-style-bugfix-zikula-trunk.patch @@ -0,0 +1,348 @@ +Index: FilterUtil/filter/filter.default.class.php +=================================================================== +--- FilterUtil/filter/filter.default.class.php (revision 15) ++++ FilterUtil/filter/filter.default.class.php (working copy) +@@ -40,7 +40,7 @@ + $this->activateOperators(array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull')); + } + +- if ($config['default'] == true || count($this->fields) <= 0) { ++ if ((isset($config['default']) && $config['default'] == true) || count($this->fields) <= 0) { + $this->default = true; + } + } +@@ -55,8 +55,9 @@ + { + static $ops = array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull'); + if (is_array($op)) { +- foreach($op as $v) ++ foreach ($op as $v) { + $this->activateOperators($v); ++ } + } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $ops) !== false) { + $this->ops[] = $op; + } +@@ -65,15 +66,17 @@ + public function addFields($fields) + { + if (is_array($fields)) { +- foreach($fields as $fld) ++ foreach ($fields as $fld) { + $this->addFields($fld); ++ } + } elseif (!empty($fields) && $this->fieldExists($fields) + && array_search($fields, $this->fields) === false) { + $this->fields[] = $fields; + } + } + +- public function getFields() { ++ public function getFields() ++ { + return $this->fields; + } + +@@ -111,7 +114,7 @@ + } + switch ($op) { + case 'ne': +- return array('where' => $this->column[$field]." <> '" . $value . "'"); ++ return array('where' => $this->column[$field] . " != '" . $value . "'"); + break; + case 'lt': + return array('where' => $this->column[$field]." < '" . $value . "'"); +@@ -132,7 +135,7 @@ + return array('where' => $this->column[$field]." = '' OR ".$this->column[$field]." IS NULL"); + break; + case 'notnull': +- return array('where' => $this->column[$field]." <> '' AND ".$this->column[$field]." IS NOT NULL"); ++ return array('where' => $this->column[$field] . " != '' AND " . $this->column[$field] . " IS NOT NULL"); + break; + case 'eq': + return array('where' => $this->column[$field]." = '" . $value . "'"); +Index: FilterUtil/filter/filter.replaceName.class.php +=================================================================== +--- FilterUtil/filter/filter.replaceName.class.php (revision 15) ++++ FilterUtil/filter/filter.replaceName.class.php (working copy) +@@ -27,8 +27,9 @@ + public function __construct($config) + { + parent::__construct($config); +- if (isset($config['pair']) && is_array($config['pair'])) ++ if (isset($config['pair']) && is_array($config['pair'])) { + $this->addPair($config['pair']); ++ } + } + + /** +@@ -37,12 +38,14 @@ + * @param mixed $pair Replace Pair + * @access public + */ +- public function addPair($pair) { ++ public function addPair($pair) ++ { + foreach ($pair as $f => $r) { +- if (is_array($r)) ++ if (is_array($r)) { + $this->addPair($r); +- else ++ } else { + $this->pair[$f] = $r; ++ } + } + } + +Index: FilterUtil/filter/filter.category.class.php +=================================================================== +--- FilterUtil/filter/filter.category.class.php (revision 15) ++++ FilterUtil/filter/filter.category.class.php (working copy) +@@ -53,14 +53,16 @@ + public function addFields($fields) + { + if (is_array($fields)) { +- foreach($fields as $fld) ++ foreach ($fields as $fld) { + $this->addFields($fld); ++ } + } elseif (!empty($fields) && !$this->fieldExists($fields) && array_search($fields, $this->fields) === false) { + $this->fields[] = $fields; + } + } + +- public function getFields() { ++ public function getFields() ++ { + return $this->fields; + } + +@@ -73,8 +75,9 @@ + public function activateOperators($op) + { + if (is_array($op)) { +- foreach($op as $v) ++ foreach ($op as $v) { + $this->activateOperators($v); ++ } + } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) { + $this->ops[] = $op; + } +@@ -89,8 +92,9 @@ + public function getOperators() + { + $fields = $this->getFields(); +- if ($this->default == true) ++ if ($this->default == true) { + $fields[] = '-'; ++ } + $ops = array(); + foreach ($this->ops as $op) { + $ops[$op] = $fields; +@@ -104,7 +108,8 @@ + * @see CategoryUtil + * @param mixed $property Category Property + */ +- public function setProperty($property) { ++ public function setProperty($property) ++ { + $this->property = (array) $property; + } + +@@ -149,4 +154,4 @@ + } + return array('where' => $where); + } +-} +\ No newline at end of file ++} +Index: FilterUtil/filter/filter.date.class.php +=================================================================== +--- FilterUtil/filter/filter.date.class.php (revision 15) ++++ FilterUtil/filter/filter.date.class.php (working copy) +@@ -53,8 +53,9 @@ + public function activateOperators($op) + { + if (is_array($op)) { +- foreach($op as $v) ++ foreach ($op as $v) { + $this->activateOperators($v); ++ } + } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) { + $this->ops[] = $op; + } +@@ -63,15 +64,17 @@ + public function addFields($fields) + { + if (is_array($fields)) { +- foreach($fields as $fld) ++ foreach ($fields as $fld) { + $this->addFields($fld); ++ } + } elseif (!empty($fields) && $this->fieldExists($fields) + && array_search($fields, $this->fields) === false) { + $this->fields[] = $fields; + } + } + +- public function getFields() { ++ public function getFields() ++ { + return $this->fields; + } + +@@ -84,8 +87,9 @@ + public function getOperators() + { + $fields = $this->getFields(); +- if ($this->default == true) ++ if ($this->default == true) { + $fields[] = '-'; ++ } + $ops = array(); + foreach ($this->ops as $op) { + $ops[$op] = $fields; +@@ -142,7 +146,8 @@ + return $time; + } + +- private function makePeriod($date, $type) { ++ private function makePeriod($date, $type) ++ { + $datearray = getdate($date); + switch($type) { + case 'year': +@@ -154,8 +159,8 @@ + $to = strtotime('+1 month', $from); + break; + /**case 'week': +- $from = DateUtil::getDatetime("substr ($date, 0, strpos ($date, ' ')); +- $to = DateUtil::getDatetime("$from +1 year"); ++ $from = DateUtil::getDatetime(substr($date, 0, strpos($date, ' ')); ++ $to = DateUtil::getDatetime($from . ' +1 year'); + break;*/ + case 'day': + case 'tomorrow': +@@ -176,9 +181,11 @@ + return array($from, $to); + } + +- public function GetSQL($field, $op, $value) { +- if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) ++ public function GetSQL($field, $op, $value) ++ { ++ if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) { + return ''; ++ } + $type = 'point'; + if (preg_match('~^(year|month|week|day|hour|min):\s*(.*)$~i', $value, $res)) { + $type = strtolower($res[1]); +@@ -204,7 +211,7 @@ + list($from, $to) = $this->makePeriod($time, $type); + $where = $this->column[$field].' < \''.DateUtil::getDatetime($from).'\' AND '.$this->column[$field].' >= \''.DateUtil::getDatetime($to).'\''; + } else { +- $where = $this->column[$field].' <> \''.DateUtil::getDatetime($time).'\''; ++ $where = $this->column[$field] . ' != \'' . DateUtil::getDatetime($time) . '\''; + } + break; + case 'gt': +@@ -231,4 +238,4 @@ + + } + } +-?> +\ No newline at end of file ++?> +Index: FilterUtil/FilterUtil_Common.class.php +=================================================================== +--- FilterUtil/FilterUtil_Common.class.php (revision 15) ++++ FilterUtil/FilterUtil_Common.class.php (working copy) +@@ -89,7 +89,7 @@ + */ + protected function setTable($table) + { +- $pntable =& pnDBGetTables(); ++ $pntable = pnDBGetTables(); + + if (!isset($pntable[$table]) || !isset($pntable[$table . '_column'])) { + return false; +@@ -113,7 +113,7 @@ + */ + protected function setJoin(&$join) + { +- $this->join =& $join; ++ $this->join = $join; + $this->addJoinToColumn(); + } + +@@ -125,11 +125,11 @@ + */ + protected function addJoinToColumn() + { +- if (count($this->join) <= 0) ++ if (count($this->join) < 1) { + return; + +- $pntable =& pnDBGetTables(); +- $c =& $this->column; ++ $pntable = pnDBGetTables(); ++ $c = $this->column; + // reset column array... + $c = $pntable[$this->pntable.'_column']; + // now add alias "tbl" to all fields +@@ -140,7 +140,7 @@ + // add fields of all joins + $alias = 'a'; + foreach ($this->join as &$join) { +- $jc =& $pntable[$join['join_table'].'_column']; ++ $jc = $pntable[$join['join_table'].'_column']; + foreach ($join['join_field'] as $k => $f) { + $a = $join['object_field_name'][$k]; + if (isset($c[$a])) { +@@ -182,6 +182,6 @@ + { + $config['table'] = $this->pntable; + $config['module'] = $this->module; +- $config['join'] =& $this->join; ++ $config['join'] = $this->join; + } +-} +\ No newline at end of file ++} +Index: FilterUtil/FilterUtil_Plugin.class.php +=================================================================== +--- FilterUtil/FilterUtil_Plugin.class.php (revision 15) ++++ FilterUtil/FilterUtil_Plugin.class.php (working copy) +@@ -101,7 +101,7 @@ + $obj = new $class($config); + + $this->plg[] = $obj; +- $obj =& end($this->plg); ++ $obj = end($this->plg); + $obj->setID(key($this->plg)); + $this->registerPlugin(key($this->plg)); + +@@ -119,7 +119,7 @@ + */ + private function registerPlugin($k) + { +- $obj =& $this->plg[$k]; ++ $obj = $this->plg[$k]; + if ($obj instanceof FilterUtil_Build) { + $ops = $obj->getOperators(); + if (isset($ops) && is_array($ops)) { +@@ -187,7 +187,7 @@ + public function replace($field, $op, $value) + { + foreach ($this->replaces as $k) { +- $obj =& $this->plg[$k]; ++ $obj = $this->plg[$k]; + list($field, $op, $value) = $obj->replace($field, $op, $value); + } + +@@ -218,4 +218,4 @@ + return ''; + } + } +-} +\ No newline at end of file ++} diff --git a/import.log b/import.log new file mode 100644 index 0000000..f501f20 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +zikula-module-filterutil-0-0_2_20090915svn15_fc11:HEAD:zikula-module-filterutil-0-0.2.20090915svn15.fc11.src.rpm:1256154981 diff --git a/sources b/sources index e69de29..29b8918 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f2023afb84f125fce2c767c9fdf398fd filterutil-0.tar.bz2 diff --git a/zikula-module-filterutil.spec b/zikula-module-filterutil.spec new file mode 100644 index 0000000..caf2b74 --- /dev/null +++ b/zikula-module-filterutil.spec @@ -0,0 +1,56 @@ +%global zikula_base %{_datadir}/zikula +%global zikula_modname filterutil + +Name: zikula-module-%{zikula_modname} +Version: 0 +Release: 0.2.20090915svn15%{?dist} +Summary: Pagesetter like filter rules for Zikula +Group: Applications/Publishing +License: GPLv2+ +URL: http://code.zikula.org/filterutil +# svn export -r 15 https://code.zikula.org/svn/filterutil/trunk filterutil-0 +# tar -cjvf filterutil-0.tar.bz2 filterutil-0 +Source0: filterutil-0.tar.bz2 +# Style and bugfix backport from zikula Core +# https://code.zikula.org/svn/core/development/main/includes/FilterUtil +Patch0: filterutil-style-bugfix-zikula-trunk.patch +Patch1: filterutil-separate-module.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: zikula + +%description +FilterUtil brings Pagesetter like filter rules to Zikula. This work is a +backport of the module included in zikula 2.0. + +%prep +%setup -q -n %{zikula_modname}-%{version} +%patch0 -p0 +%patch1 -p1 + +%build + +find . -type 'f' -exec chmod a-x \{\} \; + +%install +rm -rf %{buildroot} + +mkdir -p %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname} +cp -pr . %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname} +rm -rf %{buildroot}/%{zikula_base}/*.pdf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc manual-developer.pdf manual-user.pdf +%{zikula_base}/config/classes/%{zikula_modname} + + +%changelog +* Thu Sep 17 2009 Toshio Kuratomi - 0-0.2.20090915svn15 +- Add fixes from itbegins for putting this in its own zikula directory + +* Tue Sep 15 2009 Toshio Kuratomi - 0-0.1.20090915svn15 +- Initial package attempt From 1afe778a6d756209e55e4c4c94bbd039b635dfc5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:19 +0000 Subject: [PATCH 2/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74af87e..c15aa75 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zikula-module-filterutil -# $Id$ +# $Id: Makefile,v 1.1 2009/10/06 17:35:24 kevin Exp $ NAME := zikula-module-filterutil SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8f35e6fd41e32dac9427cb444f0144ec5f5e192f Mon Sep 17 00:00:00 2001 From: Sebastian Dziallas Date: Mon, 7 Dec 2009 18:25:40 +0000 Subject: [PATCH 3/6] Modify install location and fix typo in bugfix patch --- filterutil-style-bugfix-zikula-trunk.patch | 2 +- zikula-module-filterutil.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/filterutil-style-bugfix-zikula-trunk.patch b/filterutil-style-bugfix-zikula-trunk.patch index 26309c4..b4eee24 100644 --- a/filterutil-style-bugfix-zikula-trunk.patch +++ b/filterutil-style-bugfix-zikula-trunk.patch @@ -279,7 +279,7 @@ Index: FilterUtil/FilterUtil_Common.class.php protected function addJoinToColumn() { - if (count($this->join) <= 0) -+ if (count($this->join) < 1) { ++ if (count($this->join) < 1) return; - $pntable =& pnDBGetTables(); diff --git a/zikula-module-filterutil.spec b/zikula-module-filterutil.spec index caf2b74..00609fb 100644 --- a/zikula-module-filterutil.spec +++ b/zikula-module-filterutil.spec @@ -3,7 +3,7 @@ Name: zikula-module-%{zikula_modname} Version: 0 -Release: 0.2.20090915svn15%{?dist} +Release: 0.3.20090915svn15%{?dist} Summary: Pagesetter like filter rules for Zikula Group: Applications/Publishing License: GPLv2+ @@ -35,8 +35,8 @@ find . -type 'f' -exec chmod a-x \{\} \; %install rm -rf %{buildroot} -mkdir -p %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname} -cp -pr . %{buildroot}/%{zikula_base}/config/classes/%{zikula_modname} +mkdir -p %{buildroot}/%{zikula_base}/config/classes +cp -pr . %{buildroot}/%{zikula_base}/config/classes rm -rf %{buildroot}/%{zikula_base}/*.pdf %clean @@ -45,10 +45,13 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc manual-developer.pdf manual-user.pdf -%{zikula_base}/config/classes/%{zikula_modname} +%{zikula_base}/config/classes %changelog +* Sun Dec 06 2009 Sebastian Dziallas - 0.3.20090915svn15 +- Modify install location and fix typo in bugfix patch + * Thu Sep 17 2009 Toshio Kuratomi - 0-0.2.20090915svn15 - Add fixes from itbegins for putting this in its own zikula directory From 0fbce50e2b46a1b90b0ea96ce84746cc0e0092cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:30:43 +0000 Subject: [PATCH 4/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c15aa75..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zikula-module-filterutil -# $Id: Makefile,v 1.1 2009/10/06 17:35:24 kevin Exp $ -NAME := zikula-module-filterutil -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index f501f20..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -zikula-module-filterutil-0-0_2_20090915svn15_fc11:HEAD:zikula-module-filterutil-0-0.2.20090915svn15.fc11.src.rpm:1256154981 From 84c2bcd3531c692774c9238a5c13fa3c0496a9cb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 02:56:59 -0600 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zikula-module-filterutil.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zikula-module-filterutil.spec b/zikula-module-filterutil.spec index 00609fb..f7461c7 100644 --- a/zikula-module-filterutil.spec +++ b/zikula-module-filterutil.spec @@ -3,7 +3,7 @@ Name: zikula-module-%{zikula_modname} Version: 0 -Release: 0.3.20090915svn15%{?dist} +Release: 0.4.20090915svn15%{?dist} Summary: Pagesetter like filter rules for Zikula Group: Applications/Publishing License: GPLv2+ @@ -49,6 +49,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0-0.4.20090915svn15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Dec 06 2009 Sebastian Dziallas - 0.3.20090915svn15 - Modify install location and fix typo in bugfix patch From 3380b6cb80f60443c4ac761c8963b56c01fbec62 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 23 Feb 2011 17:11:43 -0500 Subject: [PATCH 6/6] Retire zikula-module-filterutil. --- dead.package | 1 + filterutil-separate-module.patch | 13 - filterutil-style-bugfix-zikula-trunk.patch | 348 --------------------- sources | 1 - zikula-module-filterutil.spec | 62 ---- 5 files changed, 1 insertion(+), 424 deletions(-) create mode 100644 dead.package delete mode 100644 filterutil-separate-module.patch delete mode 100644 filterutil-style-bugfix-zikula-trunk.patch delete mode 100644 sources delete mode 100644 zikula-module-filterutil.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..de91ae3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired due to no active owner on 2011-02-23 diff --git a/filterutil-separate-module.patch b/filterutil-separate-module.patch deleted file mode 100644 index 1dcbe54..0000000 --- a/filterutil-separate-module.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: filterutil-0/FilterUtil.class.php -=================================================================== ---- filterutil-0.orig/FilterUtil.class.php -+++ filterutil-0/FilterUtil.class.php -@@ -13,7 +13,7 @@ - /** - * Define Class path - */ --define('FILTERUTIL_CLASS_PATH', 'includes/pnobjlib/FilterUtil'); -+define('FILTERUTIL_CLASS_PATH', 'config/classes/FilterUtil'); - - Loader::loadClass('FilterUtil_Plugin', FILTERUTIL_CLASS_PATH); - Loader::loadClass('FilterUtil_PluginCommon', FILTERUTIL_CLASS_PATH); diff --git a/filterutil-style-bugfix-zikula-trunk.patch b/filterutil-style-bugfix-zikula-trunk.patch deleted file mode 100644 index b4eee24..0000000 --- a/filterutil-style-bugfix-zikula-trunk.patch +++ /dev/null @@ -1,348 +0,0 @@ -Index: FilterUtil/filter/filter.default.class.php -=================================================================== ---- FilterUtil/filter/filter.default.class.php (revision 15) -+++ FilterUtil/filter/filter.default.class.php (working copy) -@@ -40,7 +40,7 @@ - $this->activateOperators(array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull')); - } - -- if ($config['default'] == true || count($this->fields) <= 0) { -+ if ((isset($config['default']) && $config['default'] == true) || count($this->fields) <= 0) { - $this->default = true; - } - } -@@ -55,8 +55,9 @@ - { - static $ops = array('eq', 'ne', 'lt', 'le', 'gt', 'ge', 'like', 'null', 'notnull'); - if (is_array($op)) { -- foreach($op as $v) -+ foreach ($op as $v) { - $this->activateOperators($v); -+ } - } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $ops) !== false) { - $this->ops[] = $op; - } -@@ -65,15 +66,17 @@ - public function addFields($fields) - { - if (is_array($fields)) { -- foreach($fields as $fld) -+ foreach ($fields as $fld) { - $this->addFields($fld); -+ } - } elseif (!empty($fields) && $this->fieldExists($fields) - && array_search($fields, $this->fields) === false) { - $this->fields[] = $fields; - } - } - -- public function getFields() { -+ public function getFields() -+ { - return $this->fields; - } - -@@ -111,7 +114,7 @@ - } - switch ($op) { - case 'ne': -- return array('where' => $this->column[$field]." <> '" . $value . "'"); -+ return array('where' => $this->column[$field] . " != '" . $value . "'"); - break; - case 'lt': - return array('where' => $this->column[$field]." < '" . $value . "'"); -@@ -132,7 +135,7 @@ - return array('where' => $this->column[$field]." = '' OR ".$this->column[$field]." IS NULL"); - break; - case 'notnull': -- return array('where' => $this->column[$field]." <> '' AND ".$this->column[$field]." IS NOT NULL"); -+ return array('where' => $this->column[$field] . " != '' AND " . $this->column[$field] . " IS NOT NULL"); - break; - case 'eq': - return array('where' => $this->column[$field]." = '" . $value . "'"); -Index: FilterUtil/filter/filter.replaceName.class.php -=================================================================== ---- FilterUtil/filter/filter.replaceName.class.php (revision 15) -+++ FilterUtil/filter/filter.replaceName.class.php (working copy) -@@ -27,8 +27,9 @@ - public function __construct($config) - { - parent::__construct($config); -- if (isset($config['pair']) && is_array($config['pair'])) -+ if (isset($config['pair']) && is_array($config['pair'])) { - $this->addPair($config['pair']); -+ } - } - - /** -@@ -37,12 +38,14 @@ - * @param mixed $pair Replace Pair - * @access public - */ -- public function addPair($pair) { -+ public function addPair($pair) -+ { - foreach ($pair as $f => $r) { -- if (is_array($r)) -+ if (is_array($r)) { - $this->addPair($r); -- else -+ } else { - $this->pair[$f] = $r; -+ } - } - } - -Index: FilterUtil/filter/filter.category.class.php -=================================================================== ---- FilterUtil/filter/filter.category.class.php (revision 15) -+++ FilterUtil/filter/filter.category.class.php (working copy) -@@ -53,14 +53,16 @@ - public function addFields($fields) - { - if (is_array($fields)) { -- foreach($fields as $fld) -+ foreach ($fields as $fld) { - $this->addFields($fld); -+ } - } elseif (!empty($fields) && !$this->fieldExists($fields) && array_search($fields, $this->fields) === false) { - $this->fields[] = $fields; - } - } - -- public function getFields() { -+ public function getFields() -+ { - return $this->fields; - } - -@@ -73,8 +75,9 @@ - public function activateOperators($op) - { - if (is_array($op)) { -- foreach($op as $v) -+ foreach ($op as $v) { - $this->activateOperators($v); -+ } - } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) { - $this->ops[] = $op; - } -@@ -89,8 +92,9 @@ - public function getOperators() - { - $fields = $this->getFields(); -- if ($this->default == true) -+ if ($this->default == true) { - $fields[] = '-'; -+ } - $ops = array(); - foreach ($this->ops as $op) { - $ops[$op] = $fields; -@@ -104,7 +108,8 @@ - * @see CategoryUtil - * @param mixed $property Category Property - */ -- public function setProperty($property) { -+ public function setProperty($property) -+ { - $this->property = (array) $property; - } - -@@ -149,4 +154,4 @@ - } - return array('where' => $where); - } --} -\ No newline at end of file -+} -Index: FilterUtil/filter/filter.date.class.php -=================================================================== ---- FilterUtil/filter/filter.date.class.php (revision 15) -+++ FilterUtil/filter/filter.date.class.php (working copy) -@@ -53,8 +53,9 @@ - public function activateOperators($op) - { - if (is_array($op)) { -- foreach($op as $v) -+ foreach ($op as $v) { - $this->activateOperators($v); -+ } - } elseif (!empty($op) && array_search($op, $this->ops) === false && array_search($op, $this->availableOperators()) !== false) { - $this->ops[] = $op; - } -@@ -63,15 +64,17 @@ - public function addFields($fields) - { - if (is_array($fields)) { -- foreach($fields as $fld) -+ foreach ($fields as $fld) { - $this->addFields($fld); -+ } - } elseif (!empty($fields) && $this->fieldExists($fields) - && array_search($fields, $this->fields) === false) { - $this->fields[] = $fields; - } - } - -- public function getFields() { -+ public function getFields() -+ { - return $this->fields; - } - -@@ -84,8 +87,9 @@ - public function getOperators() - { - $fields = $this->getFields(); -- if ($this->default == true) -+ if ($this->default == true) { - $fields[] = '-'; -+ } - $ops = array(); - foreach ($this->ops as $op) { - $ops[$op] = $fields; -@@ -142,7 +146,8 @@ - return $time; - } - -- private function makePeriod($date, $type) { -+ private function makePeriod($date, $type) -+ { - $datearray = getdate($date); - switch($type) { - case 'year': -@@ -154,8 +159,8 @@ - $to = strtotime('+1 month', $from); - break; - /**case 'week': -- $from = DateUtil::getDatetime("substr ($date, 0, strpos ($date, ' ')); -- $to = DateUtil::getDatetime("$from +1 year"); -+ $from = DateUtil::getDatetime(substr($date, 0, strpos($date, ' ')); -+ $to = DateUtil::getDatetime($from . ' +1 year'); - break;*/ - case 'day': - case 'tomorrow': -@@ -176,9 +181,11 @@ - return array($from, $to); - } - -- public function GetSQL($field, $op, $value) { -- if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) -+ public function GetSQL($field, $op, $value) -+ { -+ if (array_search($op, $this->ops) === false || array_search($field, $this->fields) === false) { - return ''; -+ } - $type = 'point'; - if (preg_match('~^(year|month|week|day|hour|min):\s*(.*)$~i', $value, $res)) { - $type = strtolower($res[1]); -@@ -204,7 +211,7 @@ - list($from, $to) = $this->makePeriod($time, $type); - $where = $this->column[$field].' < \''.DateUtil::getDatetime($from).'\' AND '.$this->column[$field].' >= \''.DateUtil::getDatetime($to).'\''; - } else { -- $where = $this->column[$field].' <> \''.DateUtil::getDatetime($time).'\''; -+ $where = $this->column[$field] . ' != \'' . DateUtil::getDatetime($time) . '\''; - } - break; - case 'gt': -@@ -231,4 +238,4 @@ - - } - } --?> -\ No newline at end of file -+?> -Index: FilterUtil/FilterUtil_Common.class.php -=================================================================== ---- FilterUtil/FilterUtil_Common.class.php (revision 15) -+++ FilterUtil/FilterUtil_Common.class.php (working copy) -@@ -89,7 +89,7 @@ - */ - protected function setTable($table) - { -- $pntable =& pnDBGetTables(); -+ $pntable = pnDBGetTables(); - - if (!isset($pntable[$table]) || !isset($pntable[$table . '_column'])) { - return false; -@@ -113,7 +113,7 @@ - */ - protected function setJoin(&$join) - { -- $this->join =& $join; -+ $this->join = $join; - $this->addJoinToColumn(); - } - -@@ -125,11 +125,11 @@ - */ - protected function addJoinToColumn() - { -- if (count($this->join) <= 0) -+ if (count($this->join) < 1) - return; - -- $pntable =& pnDBGetTables(); -- $c =& $this->column; -+ $pntable = pnDBGetTables(); -+ $c = $this->column; - // reset column array... - $c = $pntable[$this->pntable.'_column']; - // now add alias "tbl" to all fields -@@ -140,7 +140,7 @@ - // add fields of all joins - $alias = 'a'; - foreach ($this->join as &$join) { -- $jc =& $pntable[$join['join_table'].'_column']; -+ $jc = $pntable[$join['join_table'].'_column']; - foreach ($join['join_field'] as $k => $f) { - $a = $join['object_field_name'][$k]; - if (isset($c[$a])) { -@@ -182,6 +182,6 @@ - { - $config['table'] = $this->pntable; - $config['module'] = $this->module; -- $config['join'] =& $this->join; -+ $config['join'] = $this->join; - } --} -\ No newline at end of file -+} -Index: FilterUtil/FilterUtil_Plugin.class.php -=================================================================== ---- FilterUtil/FilterUtil_Plugin.class.php (revision 15) -+++ FilterUtil/FilterUtil_Plugin.class.php (working copy) -@@ -101,7 +101,7 @@ - $obj = new $class($config); - - $this->plg[] = $obj; -- $obj =& end($this->plg); -+ $obj = end($this->plg); - $obj->setID(key($this->plg)); - $this->registerPlugin(key($this->plg)); - -@@ -119,7 +119,7 @@ - */ - private function registerPlugin($k) - { -- $obj =& $this->plg[$k]; -+ $obj = $this->plg[$k]; - if ($obj instanceof FilterUtil_Build) { - $ops = $obj->getOperators(); - if (isset($ops) && is_array($ops)) { -@@ -187,7 +187,7 @@ - public function replace($field, $op, $value) - { - foreach ($this->replaces as $k) { -- $obj =& $this->plg[$k]; -+ $obj = $this->plg[$k]; - list($field, $op, $value) = $obj->replace($field, $op, $value); - } - -@@ -218,4 +218,4 @@ - return ''; - } - } --} -\ No newline at end of file -+} diff --git a/sources b/sources deleted file mode 100644 index 29b8918..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f2023afb84f125fce2c767c9fdf398fd filterutil-0.tar.bz2 diff --git a/zikula-module-filterutil.spec b/zikula-module-filterutil.spec deleted file mode 100644 index f7461c7..0000000 --- a/zikula-module-filterutil.spec +++ /dev/null @@ -1,62 +0,0 @@ -%global zikula_base %{_datadir}/zikula -%global zikula_modname filterutil - -Name: zikula-module-%{zikula_modname} -Version: 0 -Release: 0.4.20090915svn15%{?dist} -Summary: Pagesetter like filter rules for Zikula -Group: Applications/Publishing -License: GPLv2+ -URL: http://code.zikula.org/filterutil -# svn export -r 15 https://code.zikula.org/svn/filterutil/trunk filterutil-0 -# tar -cjvf filterutil-0.tar.bz2 filterutil-0 -Source0: filterutil-0.tar.bz2 -# Style and bugfix backport from zikula Core -# https://code.zikula.org/svn/core/development/main/includes/FilterUtil -Patch0: filterutil-style-bugfix-zikula-trunk.patch -Patch1: filterutil-separate-module.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -Requires: zikula - -%description -FilterUtil brings Pagesetter like filter rules to Zikula. This work is a -backport of the module included in zikula 2.0. - -%prep -%setup -q -n %{zikula_modname}-%{version} -%patch0 -p0 -%patch1 -p1 - -%build - -find . -type 'f' -exec chmod a-x \{\} \; - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}/%{zikula_base}/config/classes -cp -pr . %{buildroot}/%{zikula_base}/config/classes -rm -rf %{buildroot}/%{zikula_base}/*.pdf - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%doc manual-developer.pdf manual-user.pdf -%{zikula_base}/config/classes - - -%changelog -* Tue Feb 08 2011 Fedora Release Engineering - 0-0.4.20090915svn15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Dec 06 2009 Sebastian Dziallas - 0.3.20090915svn15 -- Modify install location and fix typo in bugfix patch - -* Thu Sep 17 2009 Toshio Kuratomi - 0-0.2.20090915svn15 -- Add fixes from itbegins for putting this in its own zikula directory - -* Tue Sep 15 2009 Toshio Kuratomi - 0-0.1.20090915svn15 -- Initial package attempt