--- prewikka-1.0.0.orig/prewikka/siteconfig.py +++ prewikka-1.0.0/prewikka/siteconfig.py @@ -0,0 +1,7 @@ +htdocs_dir = '/usr/share/prewikka/htdocs' +database_dir = '/usr/share/prewikka/database' +locale_dir = '/usr/share/locale' +conf_dir = '/usr/etc/prewikka' +version = '1.0.0' +libprelude_required_version = '0.9.23' +libpreludedb_required_version = '0.9.12' --- prewikka-1.0.0.orig/prewikka/templates/SensorListing.py +++ prewikka-1.0.0/prewikka/templates/SensorListing.py @@ -31,10 +31,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941688.9659989 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:48 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.3375969 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/SensorListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -164,7 +164,7 @@ ######################################## ## START - generated method body - _orig_filter_33583529 = _filter + _orig_filter_43289975 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -563,7 +563,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_33583529 + _filter = self._CHEETAH__currentFilter = _orig_filter_43289975 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/LoginPasswordForm.py +++ prewikka-1.0.0/prewikka/templates/LoginPasswordForm.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715457.776834 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:37 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.387358 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/LoginPasswordForm.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -81,7 +81,7 @@ ######################################## ## START - generated method body - _orig_filter_93740668 = _filter + _orig_filter_96679323 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -140,7 +140,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_93740668 + _filter = self._CHEETAH__currentFilter = _orig_filter_96679323 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/FilterEdition.py +++ prewikka-1.0.0/prewikka/templates/FilterEdition.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715456.871655 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:36 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.255414 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/FilterEdition.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -176,7 +176,7 @@ ''') - _orig_filter_56347537 = _filter + _orig_filter_97275877 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -254,8 +254,8 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_56347537 - _orig_filter_28191518 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_97275877 + _orig_filter_93820137 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -283,8 +283,8 @@ write(u'''//--> ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_28191518 - _orig_filter_13610326 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_93820137 + _orig_filter_30530056 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -345,7 +345,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_13610326 + _filter = self._CHEETAH__currentFilter = _orig_filter_30530056 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/HTMLDocument.py +++ prewikka-1.0.0/prewikka/templates/HTMLDocument.py @@ -27,10 +27,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941688.861634 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:48 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.37431 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/HTMLDocument.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/Command.py +++ prewikka-1.0.0/prewikka/templates/Command.py @@ -8,14 +8,14 @@ import sys import os import os.path +import __builtin__ from os.path import getmtime, exists import time import types -import __builtin__ from Cheetah.Version import MinCompatibleVersion as RequiredCheetahVersion from Cheetah.Version import MinCompatibleVersionTuple as RequiredCheetahVersionTuple from Cheetah.Template import Template -from Cheetah.DummyTransaction import DummyTransaction +from Cheetah.DummyTransaction import * from Cheetah.NameMapper import NotFound, valueForName, valueFromSearchList, valueFromFrameOrSearchList from Cheetah.CacheRegion import CacheRegion import Cheetah.Filters as Filters @@ -24,21 +24,17 @@ ################################################## ## MODULE CONSTANTS -try: - True, False -except NameError: - True, False = (1==1), (1==0) VFFSL=valueFromFrameOrSearchList VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.0.1' -__CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1246532807.9366729 -__CHEETAH_genTimestamp__ = 'Thu Jul 2 13:06:47 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.965344 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/Command.tmpl' __CHEETAH_srcLastModified__ = 'Thu Jul 2 13:06:46 2009' -__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' +__CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: raise AssertionError( @@ -57,7 +53,7 @@ def __init__(self, *args, **KWs): - ClassicLayout.__init__(self, *args, **KWs) + super(Command, self).__init__(*args, **KWs) if not self._CHEETAH__instanceInitialized: cheetahKWArgs = {} allowedKWs = 'searchList namespaces filter filtersLib errorCatcher'.split() @@ -85,11 +81,11 @@ ######################################## ## START - generated method body - write('''
+ write(u'''
''') - _v = VFFSL(SL,"command_output",True) # '$command_output' on line 5, col 3 - if _v is not None: write(_filter(_v, rawExpr='$command_output')) # from line 5, col 3. - write(''' + _v = VFFSL(SL,"command_output",True) # u'$command_output' on line 5, col 3 + if _v is not None: write(_filter(_v, rawExpr=u'$command_output')) # from line 5, col 3. + write(u'''
''') @@ -118,7 +114,7 @@ ######################################## ## START - generated method body - write(''' + write(u''' ''') self.main_content(trans=trans) --- prewikka-1.0.0.orig/prewikka/templates/MessageListing.py +++ prewikka-1.0.0/prewikka/templates/MessageListing.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941689.6445751 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:49 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.1885309 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/MessageListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -641,7 +641,7 @@ ''') - _orig_filter_33935114 = _filter + _orig_filter_18031217 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -821,15 +821,15 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_33935114 - _orig_filter_97343894 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_18031217 + _orig_filter_99777094 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] else: _filter = self._CHEETAH__currentFilter = \ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter - _filter = self._CHEETAH__currentFilter = _orig_filter_97343894 + _filter = self._CHEETAH__currentFilter = _orig_filter_99777094 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/AlertListing.py +++ prewikka-1.0.0/prewikka/templates/AlertListing.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1267003059.569206 -__CHEETAH_genTimestamp__ = 'Wed Feb 24 10:17:39 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.9131529 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/AlertListing.tmpl' __CHEETAH_srcLastModified__ = 'Wed Feb 24 10:16:50 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -82,7 +82,7 @@ ######################################## ## START - generated method body - _orig_filter_66027672 = _filter + _orig_filter_75326880 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -93,8 +93,8 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_45552563 + _filter = self._CHEETAH__currentFilter = _orig_filter_54574444 ######################################## ## END - generated method body @@ -1509,7 +1509,7 @@ ''') - _orig_filter_63287189 = _filter + _orig_filter_42844483 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1522,7 +1522,7 @@ _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"direction.service",True), VFFSL(SL,"_",False)("Filter on this port/protocol")) # u'$writeInlineFilter($direction.service, $_("Filter on this port/protocol"))' on line 683, col 26 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($direction.service, $_("Filter on this port/protocol"))')) # from line 683, col 26. write(u'''
''') - _filter = self._CHEETAH__currentFilter = _orig_filter_63287189 + _filter = self._CHEETAH__currentFilter = _orig_filter_42844483 write(u''' ''') if VFFSL(SL,"direction.port.value",True): # generated from line 684, col 9 @@ -1577,7 +1577,7 @@ ######################################## ## START - generated method body - _orig_filter_25989606 = _filter + _orig_filter_89148756 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1651,7 +1651,7 @@ if _v is not None: write(_filter(_v, rawExpr=u'$info.count')) # from line 722, col 8. write(u''' x ''') - _orig_filter_82669679 = _filter + _orig_filter_52018376 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1661,7 +1661,7 @@ _v = VFFSL(SL,"classificationWrite",False)(VFFSL(SL,"info",True), VFFSL(SL,"text",True)) # u'$classificationWrite($info, $text)' on line 723, col 24 if _v is not None: write(_filter(_v, rawExpr=u'$classificationWrite($info, $text)')) # from line 723, col 24. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_82669679 + _filter = self._CHEETAH__currentFilter = _orig_filter_52018376 write(u''' ''') else: # generated from line 724, col 7 @@ -1709,7 +1709,7 @@ ''') else: # generated from line 735, col 7 write(u''' ''') - _orig_filter_62816141 = _filter + _orig_filter_29626284 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1719,14 +1719,14 @@ _v = VFFSL(SL,"classificationWrite",False)(VFFSL(SL,"info",True), VFFSL(SL,"text",True)) # u'$classificationWrite($info, $text)' on line 736, col 23 if _v is not None: write(_filter(_v, rawExpr=u'$classificationWrite($info, $text)')) # from line 736, col 23. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_62816141 + _filter = self._CHEETAH__currentFilter = _orig_filter_29626284 write(u''' ''') write(u''' ''') if VFFSL(SL,"info.completion.value",True): # generated from line 740, col 5 write(u''' (''') - _orig_filter_16311933 = _filter + _orig_filter_37328064 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1735,7 +1735,7 @@ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"info.completion",True), cl="impact_completion_" + VFFSL(SL,"info.completion.value",True)) # u'$writeInlineFilter($info.completion, cl="impact_completion_" + $info.completion.value)' on line 741, col 22 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($info.completion, cl="impact_completion_" + $info.completion.value)')) # from line 741, col 22. - _filter = self._CHEETAH__currentFilter = _orig_filter_16311933 + _filter = self._CHEETAH__currentFilter = _orig_filter_37328064 write(u''') ''') write(u''' @@ -1753,7 +1753,7 @@ if _v is not None: write(_filter(_v, rawExpr=u'$name.value')) # from line 748, col 43. write(u'''''') else: # generated from line 748, col 58 - _orig_filter_12694750 = _filter + _orig_filter_79763792 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1762,11 +1762,11 @@ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"name",True)) # u'$writeInlineFilter($name)' on line 748, col 79 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($name)')) # from line 748, col 79. - _filter = self._CHEETAH__currentFilter = _orig_filter_12694750 + _filter = self._CHEETAH__currentFilter = _orig_filter_79763792 sep = ", " write(u''' - ''') - _orig_filter_35051930 = _filter + _orig_filter_55254751 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1777,7 +1777,7 @@ _("Filter on this reference") _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"name",True), VFFSL(SL,"_",False)("Filter on this reference")) # u'$writeInlineFilter($name, $_("Filter on this reference"))' on line 751, col 19 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($name, $_("Filter on this reference"))')) # from line 751, col 19. - _filter = self._CHEETAH__currentFilter = _orig_filter_35051930 + _filter = self._CHEETAH__currentFilter = _orig_filter_55254751 write(u'''
- - ''') - _orig_filter_60542421 = _filter + _orig_filter_60062577 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1856,7 +1856,7 @@ _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"address",True), VFFSL(SL,"unicode",False)(VFFSL(SL,"_",False)("Filter on this %s") % (VFFSL(SL,"name",True)))) # u'$writeInlineFilter($address, $unicode($_("Filter on this %s") % ($name)))' on line 780, col 27 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($address, $unicode($_("Filter on this %s") % ($name)))')) # from line 780, col 27. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_60542421 + _filter = self._CHEETAH__currentFilter = _orig_filter_60062577 write(u'''
@@ -1886,7 +1886,7 @@ write(u'''
''') write(u''' ''') - _orig_filter_37575375 = _filter + _orig_filter_75110086 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1896,7 +1896,7 @@ _v = VFFSL(SL,"writeService",False)(":", VFFSL(SL,"direction",True)) # u'$writeService(":", $direction)' on line 791, col 16 if _v is not None: write(_filter(_v, rawExpr=u'$writeService(":", $direction)')) # from line 791, col 16. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_37575375 + _filter = self._CHEETAH__currentFilter = _orig_filter_75110086 write(u'''
''') @@ -1904,7 +1904,7 @@ ''') if VFFSL(SL,"len",False)(VFFSL(SL,"direction.addresses",True)) == 0: # generated from line 795, col 7 write(u''' ''') - _orig_filter_54695530 = _filter + _orig_filter_49119626 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1914,7 +1914,7 @@ _v = VFFSL(SL,"writeService",False)("service:", VFFSL(SL,"direction",True)) # u'$writeService("service:", $direction)' on line 796, col 24 if _v is not None: write(_filter(_v, rawExpr=u'$writeService("service:", $direction)')) # from line 796, col 24. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_54695530 + _filter = self._CHEETAH__currentFilter = _orig_filter_49119626 write(u''' ''') write(u''' @@ -1929,7 +1929,7 @@ _v = VFFSL(SL,"name",True) # u'$name' on line 805, col 10 if _v is not None: write(_filter(_v, rawExpr=u'$name')) # from line 805, col 10. write(u''': ''') - _orig_filter_23199653 = _filter + _orig_filter_89094864 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1939,7 +1939,7 @@ _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"value",True)) # u'$writeInlineFilter($value)' on line 805, col 32 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($value)')) # from line 805, col 32. write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_23199653 + _filter = self._CHEETAH__currentFilter = _orig_filter_89094864 write(u''' ''') if VFFSL(SL,"extra",True) != None: # generated from line 806, col 10 @@ -1960,7 +1960,7 @@ for sensor in VFFSL(SL,"message.sensors",True): # generated from line 818, col 3 if VFFSL(SL,"sensor.name.value",True): # generated from line 819, col 5 write(u''' ''') - _orig_filter_87412113 = _filter + _orig_filter_81861239 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1969,12 +1969,12 @@ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"sensor.name",True)) # u'$writeInlineFilter($sensor.name)' on line 820, col 20 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($sensor.name)')) # from line 820, col 20. - _filter = self._CHEETAH__currentFilter = _orig_filter_87412113 + _filter = self._CHEETAH__currentFilter = _orig_filter_81861239 write(u''' ''') if VFFSL(SL,"sensor.node_name.value",True): # generated from line 822, col 5 write(u''' (''') - _orig_filter_69167741 = _filter + _orig_filter_49144739 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -1983,7 +1983,7 @@ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter _v = VFFSL(SL,"writeInlineFilter",False)(VFFSL(SL,"sensor.node_name",True)) # u'$writeInlineFilter($sensor.node_name)' on line 823, col 22 if _v is not None: write(_filter(_v, rawExpr=u'$writeInlineFilter($sensor.node_name)')) # from line 823, col 22. - _filter = self._CHEETAH__currentFilter = _orig_filter_69167741 + _filter = self._CHEETAH__currentFilter = _orig_filter_49144739 write(u''') ''') write(u'''
@@ -2022,15 +2022,15 @@ ''') write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_25989606 - _orig_filter_92441775 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_89148756 + _orig_filter_37041077 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] else: _filter = self._CHEETAH__currentFilter = \ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter - _filter = self._CHEETAH__currentFilter = _orig_filter_92441775 + _filter = self._CHEETAH__currentFilter = _orig_filter_37041077 ######################################## ## END - generated method body @@ -2100,7 +2100,7 @@ ######################################## ## START - generated method body - _orig_filter_74673310 = _filter + _orig_filter_65767711 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -2134,15 +2134,15 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_74673310 - _orig_filter_29643203 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_65767711 + _orig_filter_55432499 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] else: _filter = self._CHEETAH__currentFilter = \ self._CHEETAH__filters[filterName] = getattr(self._CHEETAH__filtersLib, filterName)(self).filter - _filter = self._CHEETAH__currentFilter = _orig_filter_29643203 + _filter = self._CHEETAH__currentFilter = _orig_filter_55432499 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/ClassicLayout.py +++ prewikka-1.0.0/prewikka/templates/ClassicLayout.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941689.0029171 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:49 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.3674049 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/ClassicLayout.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -187,7 +187,7 @@ ######################################## ## START - generated method body - _orig_filter_57219176 = _filter + _orig_filter_51770610 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -233,7 +233,7 @@
''') - _filter = self._CHEETAH__currentFilter = _orig_filter_57219176 + _filter = self._CHEETAH__currentFilter = _orig_filter_51770610 write(u'''

''') if False: _("%(username)s on %(date)s") @@ -241,7 +241,7 @@ if _v is not None: write(_filter(_v, rawExpr=u'$unicode($_("%(username)s on %(date)s") % { "username": $prewikka.userlink, "date": $prewikka.date })')) # from line 28, col 8. write(u'''

''') - _orig_filter_23257037 = _filter + _orig_filter_17251030 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -251,8 +251,8 @@ write(u'''
''') - _filter = self._CHEETAH__currentFilter = _orig_filter_23257037 - _orig_filter_49548771 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_17251030 + _orig_filter_20252304 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -266,8 +266,8 @@ write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_49548771 - _orig_filter_28678886 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_20252304 + _orig_filter_16247516 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -296,8 +296,8 @@ ''') write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_28678886 - _orig_filter_16664837 = _filter + _filter = self._CHEETAH__currentFilter = _orig_filter_16247516 + _orig_filter_12513822 = _filter filterName = u'Filter' if self._CHEETAH__filters.has_key("Filter"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -321,7 +321,7 @@ write(u''' ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_16664837 + _filter = self._CHEETAH__currentFilter = _orig_filter_12513822 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/UserSettings.py +++ prewikka-1.0.0/prewikka/templates/UserSettings.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941689.7337101 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:49 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.1997581 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/UserSettings.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -120,7 +120,7 @@ ######################################## ## START - generated method body - _orig_filter_94785286 = _filter + _orig_filter_84958441 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -372,7 +372,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_94785286 + _filter = self._CHEETAH__currentFilter = _orig_filter_84958441 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/SensorAlertListing.py +++ prewikka-1.0.0/prewikka/templates/SensorAlertListing.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715457.579129 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:37 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.2634549 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/SensorAlertListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:53:09 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/Stats.py +++ prewikka-1.0.0/prewikka/templates/Stats.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941688.8439829 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:48 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.49106 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/Stats.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -159,7 +159,7 @@ ''') - _orig_filter_40583543 = _filter + _orig_filter_81881313 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -175,7 +175,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_40583543 + _filter = self._CHEETAH__currentFilter = _orig_filter_81881313 ######################################## ## END - generated method body @@ -202,7 +202,7 @@ ######################################## ## START - generated method body - _orig_filter_86779617 = _filter + _orig_filter_48265267 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -229,7 +229,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_86779617 + _filter = self._CHEETAH__currentFilter = _orig_filter_48265267 write(u''' ''') for chart in VFFSL(SL,"charts",True): # generated from line 78, col 1 @@ -341,7 +341,7 @@ ######################################## ## START - generated method body - _orig_filter_88077668 = _filter + _orig_filter_73321290 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -537,7 +537,7 @@
''') - _filter = self._CHEETAH__currentFilter = _orig_filter_88077668 + _filter = self._CHEETAH__currentFilter = _orig_filter_73321290 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/SensorHeartbeatListing.py +++ prewikka-1.0.0/prewikka/templates/SensorHeartbeatListing.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715457.6548181 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:37 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.9726419 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/SensorHeartbeatListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:53:09 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/HeartbeatAnalyze.py +++ prewikka-1.0.0/prewikka/templates/HeartbeatAnalyze.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715457.758189 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:37 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.3293509 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/HeartbeatAnalyze.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/TopLayout.py +++ prewikka-1.0.0/prewikka/templates/TopLayout.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715456.8824029 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:36 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.9535241 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/TopLayout.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/HeartbeatListing.py +++ prewikka-1.0.0/prewikka/templates/HeartbeatListing.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941191.602704 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:06:31 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.3018651 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/HeartbeatListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:06:29 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -81,7 +81,7 @@ ######################################## ## START - generated method body - _orig_filter_98632394 = _filter + _orig_filter_98832178 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -157,7 +157,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_98632394 + _filter = self._CHEETAH__currentFilter = _orig_filter_98832178 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/PropertiesChangeForm.py +++ prewikka-1.0.0/prewikka/templates/PropertiesChangeForm.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715456.907383 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:36 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.359556 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/PropertiesChangeForm.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/utils.py +++ prewikka-1.0.0/prewikka/templates/utils.py @@ -27,10 +27,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941689.6696711 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:49 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.943455 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/utils.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/ErrorTemplate.py +++ prewikka-1.0.0/prewikka/templates/ErrorTemplate.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941689.751287 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:14:49 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.222095 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/ErrorTemplate.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:14:18 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -82,7 +82,7 @@ ######################################## ## START - generated method body - _orig_filter_58314137 = _filter + _orig_filter_50118433 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -118,7 +118,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_58314137 + _filter = self._CHEETAH__currentFilter = _orig_filter_50118433 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/UserListing.py +++ prewikka-1.0.0/prewikka/templates/UserListing.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941191.643719 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:06:31 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.4035871 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/UserListing.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:06:29 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -81,7 +81,7 @@ ######################################## ## START - generated method body - _orig_filter_74284864 = _filter + _orig_filter_35922675 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -181,7 +181,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_74284864 + _filter = self._CHEETAH__currentFilter = _orig_filter_35922675 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/prewikka/templates/MessageSummary.py +++ prewikka-1.0.0/prewikka/templates/MessageSummary.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.2' -__CHEETAH_versionTuple__ = (2, 2, 2, 'final', 0) -__CHEETAH_genTime__ = 1266941190.8187261 -__CHEETAH_genTimestamp__ = 'Tue Feb 23 17:06:30 2010' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.0528469 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/MessageSummary.tmpl' __CHEETAH_srcLastModified__ = 'Tue Feb 23 17:06:29 2010' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/MessageDetails.py +++ prewikka-1.0.0/prewikka/templates/MessageDetails.py @@ -28,10 +28,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715457.7935669 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:37 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930090.2087381 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:50 2010' __CHEETAH_src__ = 'prewikka/templates/MessageDetails.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' --- prewikka-1.0.0.orig/prewikka/templates/About.py +++ prewikka-1.0.0/prewikka/templates/About.py @@ -29,10 +29,10 @@ VFSL=valueFromSearchList VFN=valueForName currentTime=time.time -__CHEETAH_version__ = '2.2.1' -__CHEETAH_versionTuple__ = (2, 2, 1, 'final', 0) -__CHEETAH_genTime__ = 1244715456.782759 -__CHEETAH_genTimestamp__ = 'Thu Jun 11 12:17:36 2009' +__CHEETAH_version__ = '2.4.1' +__CHEETAH_versionTuple__ = (2, 4, 1, 'final', 0) +__CHEETAH_genTime__ = 1268930089.9994209 +__CHEETAH_genTimestamp__ = 'Thu Mar 18 17:34:49 2010' __CHEETAH_src__ = 'prewikka/templates/About.tmpl' __CHEETAH_srcLastModified__ = 'Tue May 5 16:55:59 2009' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' @@ -82,7 +82,7 @@ ######################################## ## START - generated method body - _orig_filter_89429685 = _filter + _orig_filter_41542318 = _filter filterName = u'CleanOutput' if self._CHEETAH__filters.has_key("CleanOutput"): _filter = self._CHEETAH__currentFilter = self._CHEETAH__filters[filterName] @@ -252,7 +252,7 @@ ''') - _filter = self._CHEETAH__currentFilter = _orig_filter_89429685 + _filter = self._CHEETAH__currentFilter = _orig_filter_41542318 ######################################## ## END - generated method body --- prewikka-1.0.0.orig/debian/compat +++ prewikka-1.0.0/debian/compat @@ -0,0 +1 @@ +5 --- prewikka-1.0.0.orig/debian/rules +++ prewikka-1.0.0/debian/rules @@ -0,0 +1,89 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + +PYTHON := /usr/bin/python +PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]') + + +build: build-stamp + +build-stamp: + dh_testdir + python setup.py build + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -rf build + -find . -name '*.py[co]' | xargs rm -f + -find locale -mindepth 1 -maxdepth 1 -type d | xargs rm -rf + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + python setup.py install --root=$(CURDIR)/debian/prewikka --prefix=/usr --install-layout=deb + + mv $(CURDIR)/debian/prewikka/usr/etc $(CURDIR)/debian/prewikka/usr/share/prewikka + find debian/prewikka -name siteconfig.py -exec sed -i 's|/usr/etc|/etc|' {} \; + cp database/mysql.sql debian/prewikka/usr/share/dbconfig-common/data/prewikka/install/mysql + cp database/pgsql.sql debian/prewikka/usr/share/dbconfig-common/data/prewikka/install/pgsql + sed -i 's/^DROP TABLE/-- DROP TABLE/' debian/prewikka/usr/share/dbconfig-common/data/prewikka/install/pgsql + + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_link usr/share/prewikka/etc/prewikka/prewikka.conf usr/share/doc/prewikka/examples/prewikka.conf + # make python scripts executable + for i in `find debian -mindepth 3 -type f`; do \ + case $$i in \ + *.py) \ + if head -n 1 $$i | grep -q -s "#!/"; then \ + chmod 755 $$i; \ + fi; \ + ;; \ + esac \ + done + -find debian/prewikka/usr/share/prewikka/htdocs/images -maxdepth 1 -type f -exec chmod 644 {} \; + -find debian/prewikka/usr/share/prewikka/htdocs/css -maxdepth 1 -type f -exec chmod 644 {} \; +# dh_install + dh_installdebconf -pprewikka + dh_python2 -pprewikka +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- prewikka-1.0.0.orig/debian/docs +++ prewikka-1.0.0/debian/docs @@ -0,0 +1,3 @@ +HACKING.README +NEWS +README --- prewikka-1.0.0.orig/debian/prewikka.postinst +++ prewikka-1.0.0/debian/prewikka.postinst @@ -0,0 +1,79 @@ +#!/bin/sh +# postinst script for prewikka +# +# see: dh_installdeb(1) + +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + + +# helper functions + +replace_file () { + file=$1 + file_new=$2 + if [ ! -f ${file} ] ; then + mv ${file_new} ${file} + else + ucf --three-way --debconf-ok ${file_new} $file + fi +} + +do_update () { + file=$1 + file_new=$2 + if diff -q ${file} ${file_new} >/dev/null 2>&1; then + # Old file and new file are identical + rm -f ${file_new} + else + replace_file $file $file_new + rm -f ${file_new} + fi +} + + +CONF=/etc/prewikka/prewikka.conf +CONF_NEW="${CONF}-new" + + +if [ "$1" = "configure" ]; then + . /usr/share/dbconfig-common/dpkg/postinst + dbc_go prewikka $@ + + if [ -z "$dbc_dbserver" ]; then + dbc_dbserver=localhost + fi + + install -m 0640 /usr/share/prewikka/etc/prewikka/prewikka.conf $CONF_NEW + + # do the following only if user has choosen dbconfig to manage database + if [ -n "$dbc_dbtype" ]; then + # the following code is an ugly way to replace the SQL parameters in the prewikka config + # by searching the [database] entry, and replacing the values in the following lines + sed -i "/\[database\]/{n;s/type: .*$/type: $dbc_dbtype/;n;n;s/user: .*$/user: $dbc_dbuser/;n;s/pass: .*$/pass: $dbc_dbpass/;n;s/name: .*$/name: $dbc_dbname/;}" $CONF_NEW + fi + + if diff -q /usr/share/prewikka/etc/prewikka/prewikka.conf ${CONF} >/dev/null 2>&1; then + # prewikka configure file has not been changed .. overwrite it + install -m 0640 $CONF_NEW $CONF + else + do_update $CONF $CONF_NEW + fi + + db_stop + + # make sure conf file has the correct permissions and owner/group + chmod 640 /etc/prewikka/prewikka.conf + + # make sure apache user has permission to write generated images + chmod 0775 /usr/share/prewikka/htdocs/generated_images + chgrp www-data /usr/share/prewikka/htdocs/generated_images 2>/dev/null ||: +fi + +#DEBHELPER# + +exit 0 + + --- prewikka-1.0.0.orig/debian/control +++ prewikka-1.0.0/debian/control @@ -0,0 +1,28 @@ +Source: prewikka +Section: web +Priority: extra +XS-Python-Version: all +Maintainer: Pierre Chifflier +Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.6.6-3~), python-cheetah +Standards-Version: 3.8.4 + +Package: prewikka +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-cheetah, + python-prelude, + python-preludedb, + python-cairo, + ucf, + dbconfig-common +Recommends: python-twisted-names, python-twisted-core +Description: Security Information Management System [ Web Interface ] + Prewikka is a graphical front-end analysis console for the Prelude + Security Information Management (SIM) system. + . + Providing numerous features, Prewikka facilitates the work of users and + analysts. It provides alert aggregation and sensor and hearbeat views, + and has user management and configurable filters. It has access to + external tools such as whois and traceroute. + --- prewikka-1.0.0.orig/debian/prewikka.postrm +++ prewikka-1.0.0/debian/prewikka.postrm @@ -0,0 +1,38 @@ +#!/bin/sh +# postrm script for prewikka +# +# see: dh_installdeb(1) + +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 || [ $? -lt 30 ] + +if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then + . /usr/share/dbconfig-common/dpkg/postrm + dbc_go prewikka $@ +fi + +if [ "$1" = "purge" ]; then + + rm -f /etc/prewikka/prewikka.conf + rm -f /etc/prewikka/prewikka.conf-new /etc/prewikka/prewikka.conf.ucf-dist /etc/prewikka/prewikka.conf.ucf-old + if which ucf >/dev/null 2>&1; then + ucf --purge /etc/prewikka/prewikka.conf + fi + + rmdir --ignore-fail-on-non-empty /etc/prewikka || true + +fi + +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi + + +#DEBHELPER# + +exit 0 + + --- prewikka-1.0.0.orig/debian/prewikka.prerm +++ prewikka-1.0.0/debian/prewikka.prerm @@ -0,0 +1,18 @@ +#!/bin/sh +# prerm script for prewikka +# +# see: dh_installdeb(1) + +set -e + +# source debconf stuff +. /usr/share/debconf/confmodule +# source dbconfig-common stuff +. /usr/share/dbconfig-common/dpkg/prerm +dbc_go prewikka $@ + +#DEBHELPER# + +exit 0 + + --- prewikka-1.0.0.orig/debian/changelog +++ prewikka-1.0.0/debian/changelog @@ -0,0 +1,165 @@ +prewikka (1.0.0-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Convert to dh_python2 (Closes: #616950). + + -- Luca Falavigna Sat, 01 Jun 2013 14:52:24 +0200 + +prewikka (1.0.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "modifies conffiles (policy 10.7.3): /etc/prewikka/prewikka.conf": + - debian/rules: don't install configuration file to /etc; ship it + under /usr/share/prewikka + - change handling of configuration file in postinst to use the + configuration template in /usr/share/prewikka instead of the one + installed as an example (Policy 12.3.: "Packages must not require the + existence of any files in `/usr/share/doc/'") + - don't install the example anymore but make it a symlink + (Closes: #688194) + + -- gregor herrmann Sun, 30 Sep 2012 20:20:33 +0200 + +prewikka (1.0.0-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Install prewikka.conf file with mode 0640 to prevent disclosure + of db credentials (CVE-2010-2058; Closes: #584469). + NOTE to maintainer: I've seen there is a chmod 640 at the end + of the postinst script but this is on the one hand prone to a + race condition and on the other hand not always effective. + + -- Nico Golde Thu, 10 Jun 2010 15:50:02 +0200 + +prewikka (1.0.0-1) unstable; urgency=low + + * New upstream release 1.0.0 + + -- Pierre Chifflier Thu, 18 Mar 2010 17:34:33 +0100 + +prewikka (1.0.0~rc3-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Fri, 12 Feb 2010 21:47:32 +0100 + +prewikka (1.0.0~rc2-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Wed, 10 Feb 2010 15:16:56 +0100 + +prewikka (1.0.0~rc1-2) unstable; urgency=low + + * Add python-cairo to depends + * Ensure apache user can write to generated images directory + + -- Pierre Chifflier Wed, 03 Feb 2010 23:12:07 +0100 + +prewikka (1.0.0~rc1-1) unstable; urgency=low + + * New upstream release + * Bump Standards version to 3.8.4 + * Update description + + -- Pierre Chifflier Wed, 03 Feb 2010 21:38:25 +0100 + +prewikka (0.9.17.1-1) unstable; urgency=low + + * New upstream release + * Bump Standards version to 3.8.3 (no changes) + + -- Pierre Chifflier Tue, 08 Sep 2009 11:23:20 +0200 + +prewikka (0.9.17-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Tue, 07 Jul 2009 21:22:24 +0200 + +prewikka (0.9.16-1) unstable; urgency=low + + * New upstream release + * Bump Standards version to 3.8.2 (no changes) + + -- Pierre Chifflier Tue, 30 Jun 2009 21:45:27 +0200 + +prewikka (0.9.15-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Sun, 14 Jun 2009 10:00:20 +0200 + +prewikka (0.9.14-2) unstable; urgency=low + + * Update watch file + * Bump Standards version to 3.8.0 (no changes) + + -- Pierre Chifflier Wed, 02 Jul 2008 16:49:06 +0200 + +prewikka (0.9.14-1) unstable; urgency=low + + * New upstream release + * Bump Standards version + * Add python-twisted-names to Recommends (for asynchronous DNS resolution) + + -- Pierre Chifflier Wed, 02 Apr 2008 10:07:51 +0200 + +prewikka (0.9.13-1) unstable; urgency=low + + * New upstream release (with nice speed improvement) + + -- Pierre Chifflier Thu, 18 Oct 2007 21:36:30 +0200 + +prewikka (0.9.12.1-1) unstable; urgency=low + + * Update my email address + * New upstream release + + -- Pierre Chifflier Sat, 04 Aug 2007 19:26:57 +0200 + +prewikka (0.9.11.4-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Tue, 12 Jun 2007 09:51:08 +0200 + +prewikka (0.9.11.3-2) unstable; urgency=low + + * Make sure prewikka.conf is not world-readable + + -- Pierre Chifflier Fri, 08 Jun 2007 15:35:25 +0200 + +prewikka (0.9.11.3-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Thu, 31 May 2007 09:40:25 +0200 + +prewikka (0.9.11.2-1) unstable; urgency=low + + * New upstream release + + -- Pierre Chifflier Mon, 28 May 2007 16:16:44 +0200 + +prewikka (0.9.11-1) unstable; urgency=low + + * New upstream release (add internationalization support) + + -- Pierre Chifflier Tue, 22 May 2007 09:50:33 +0200 + +prewikka (0.9.10-1) unstable; urgency=low + + * New upstream release + * Patch postgresql tables creation script (do not drop inexistant tables) + * Update my email address + * Add watch file + + -- Pierre Chifflier Wed, 11 Apr 2007 14:41:09 +0200 + +prewikka (0.9.9-1) unstable; urgency=low + + * Initial release (Closes: #410090) + + -- Pierre Chifflier Wed, 7 Feb 2007 16:51:26 +0100 + --- prewikka-1.0.0.orig/debian/dirs +++ prewikka-1.0.0/debian/dirs @@ -0,0 +1,5 @@ +etc/prewikka +usr/bin +usr/share/dbconfig-common/data/prewikka/install +usr/share/dbconfig-common/data/prewikka/upgrade/mysql +usr/share/dbconfig-common/data/prewikka/upgrade/pgsql --- prewikka-1.0.0.orig/debian/README.Debian +++ prewikka-1.0.0/debian/README.Debian @@ -0,0 +1,130 @@ +prewikka for Debian +------------------- + +The Prewikka installation guide is available at: +https://trac.prelude-ids.org/wiki/InstallingPrewikka + + +Editing prewikka.conf +===================== + +Once you have created the database for Prewikka you need to edit /etc/prewikka/prewikka.conf to fit your database settings prior to starting Prewikka. +The debian installation script will try to create the database and set the values, for the [database] section ONLY. +Even if you used the installer to create the database and tables, you will need to edit the configuration file for +other values. + +[interface] +#This is the name at the top right and left of the Prewikka interface +#You can change it or leave as is +software: Prewikka +place: company ltd. +title: Prelude management + +#The following are the setting for your prelude database +[idmef_database] +type: mysql +host: localhost +user: prelude +pass: prelude +name: prelude + +#This is the database information for the prewikka DB you created above +[database] +type: mysql +host: localhost +user: prewikka +pass: prewikka +name: prewikka + +#You can comment this out to stop logs from writing to stderr +[log stderr] + +#No real need to edit this except to increase/decrease expiration time +[auth loginpassword] +expiration: 60 + + + + + +Choose one of the following methods to configure your web server: + +Running Prewikka from the Apache web server (CGI/Apache) +======================================================== + +Apache / CGI setup with VirtualHost +----------------------------------- + + + ServerName my.server.org + Setenv PREWIKKA_CONFIG "/etc/prewikka/prewikka.conf" + + + AllowOverride None + Options ExecCGI + + + AddHandler cgi-script .cgi + + + Order allow,deny + Allow from all + + +Alias /prewikka/ /usr/share/prewikka/htdocs/ +ScriptAlias / /usr/share/prewikka/cgi-bin/prewikka.cgi + + + +Note that the PREWIKKA_CONFIG environment variable is optional, if unset the default configuration file relative to your installation path will be used. + + +Apache / mod_python setup with VirtualHost +------------------------------------------ + +Experimental mod_python support is available in Prewikka starting from rc9. + + + ServerName my.server.org + + + SetHandler mod_python + PythonHandler prewikka.ModPythonHandler + PythonOption PrewikkaConfig /etc/prewikka/prewikka.conf + + + + SetHandler None + + + Alias /prewikka /usr/share/prewikka/htdocs + + +Note that the PrewikkaConfig? settings is optional, if unset the default configuration file relative to your installation path will be used. + + + +Running Prewikka from the command line tool +=========================================== + +If you didn't install Prewikka system wide (ie: you specified a prefix), use: + + $ PYTHONPATH=$prefix/lib/python2.4/site-packages $prefix/bin/prewikka-httpd + +If you installed Prewikka system wide: + + $ /usr/bin/prewikka-httpd + +You can then use your browser to connect to your machine on port 8000. The default login/password is admin please remember to change it. + + + +Initial login +============= + +Once everything is setup, you can use your browser to connect to the machine were Prewikka was installed. If you are not using Apache support, then remeber you should use the port 8000 to access Prewikka. + +The default login/password is admin please remember to change it. + + + -- Pierre Chifflier Wed, 7 Feb 2007 16:51:26 +0100 --- prewikka-1.0.0.orig/debian/prewikka.config +++ prewikka-1.0.0/debian/prewikka.config @@ -0,0 +1,24 @@ +#!/bin/bash + +set -e + +action=$1 +version=$2 + +# Source debconf library. +. /usr/share/debconf/confmodule +db_version 2.0 || [ 0 -lt 30 ] + +#db_input medium prewikka/webserver || true +#db_go + +if [ -f /usr/share/dbconfig-common/dpkg/config ]; then + dbc_dbtypes="mysql, pgsql" + dbc_authmethod_user="password" + + . /usr/share/dbconfig-common/dpkg/config + dbc_go prewikka $@ +fi + +db_input high prewikka/configuration || true +db_go --- prewikka-1.0.0.orig/debian/copyright +++ prewikka-1.0.0/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Pierre Chifflier on +Wed, 7 Feb 2007 16:51:26 +0100. + +It was downloaded from + +Upstream Author: Yoann Vandoorselaere + +Copyright: 2001-2006 Yoann Vandoorselaere + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + + +The Debian packaging is (C) 2007, Pierre Chifflier and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- prewikka-1.0.0.orig/debian/watch +++ prewikka-1.0.0/debian/watch @@ -0,0 +1,10 @@ +# debian watch file +# You can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://www.prelude-ids.com/en/development/download/index.html \ + /download/releases/prewikka/prewikka-([\d\.]*)\.tar\.gz