← Back to branch summary

~ubuntu-branches/ubuntu/raring/dansguardian/raring

~ubuntu-branches/ubuntu/raring/dansguardian/raring

« back to all changes in this revision

Viewing changes to src/HTMLTemplate.cpp

Committer: Bazaar Package Importer
Author(s): Alexander Wirt, Thomas Viehmann
Date: 2008-10-13 09:29:35 UTC
mfrom: (1.1.7 upstream) (7.1.1 squeeze)
Revision ID: james.westby@ubuntu.com-20081013092935-g8uz3kgfjs37ikgv

Tags: 2.9.9.7-2

http://bugs.debian.org/493047

[ Thomas Viehmann ]
OptionContainer.cpp: If you need to iterate through all lines in the
config file to find a field, at least don't abuse the configfile deque
by accessing it as if it was an array with signed index.
Works way better on arm, too, i.e. closes: #493047.

files added:
configs/lists/phraselists/goodphrases/weighted_general_polish

configs/lists/phraselists/pornography/weighted_polish

debian/patches/10_dont_ban_general.dpatch

debian/patches/11_FixOptionContainer.cpp_on_arm.dpatch

src/IPList.cpp

src/IPList.hpp

files removed:
debian/patches/09_fix_gcc4.3.dpatch

src/platform.h

src/platform.h.in

files modified:
Makefile.in

aclocal.m4

configs/Makefile.am

configs/Makefile.in

configs/authplugins/Makefile.am

configs/authplugins/Makefile.in

configs/contentscanners/Makefile.am

configs/contentscanners/Makefile.in

configs/downloadmanagers/Makefile.am

configs/downloadmanagers/Makefile.in

configs/lists/Makefile.am

configs/lists/Makefile.in

configs/lists/authplugins/Makefile.am

configs/lists/authplugins/Makefile.in

configs/lists/bannediplist

configs/lists/bannedregexpurllist

configs/lists/blacklists/Makefile.am

configs/lists/blacklists/Makefile.in

configs/lists/contentscanners/Makefile.am

configs/lists/contentscanners/Makefile.in

configs/lists/downloadmanagers/Makefile.am

configs/lists/downloadmanagers/Makefile.in

configs/lists/exceptioniplist

configs/lists/phraselists/Makefile.am

configs/lists/phraselists/Makefile.in

configure

configure.ac

data/Makefile.in

data/languages/Makefile.in

data/scripts/Makefile.in

debian/changelog

debian/patches/00list

debian/postinst

dgconfig.h.in

doc/Makefile.in

doc/Plugins

src/Auth.cpp

src/Auth.hpp

src/BaseSocket.cpp

src/BaseSocket.hpp

src/ConfigVar.cpp

src/ConnectionHandler.cpp

src/ConnectionHandler.hpp

src/ContentScanner.cpp

src/ContentScanner.hpp

src/DataBuffer.cpp

src/DataBuffer.hpp

src/DownloadManager.cpp

src/DownloadManager.hpp

src/DynamicIPList.cpp

src/DynamicIPList.hpp

src/DynamicURLList.cpp

src/DynamicURLList.hpp

src/FDFuncs.cpp

src/FDFuncs.hpp

src/FDTunnel.cpp

src/FDTunnel.hpp

src/FOptionContainer.cpp

src/FOptionContainer.hpp

src/FatController.cpp

src/HTMLTemplate.cpp

src/HTTPHeader.cpp

src/HTTPHeader.hpp

src/ImageContainer.cpp

src/ImageContainer.hpp

src/LanguageContainer.cpp

src/LanguageContainer.hpp

src/ListContainer.cpp

src/ListContainer.hpp

src/ListManager.cpp

src/ListManager.hpp

src/Makefile.am

src/Makefile.in

src/NaughtyFilter.cpp

src/NaughtyFilter.hpp

src/OptionContainer.cpp

src/OptionContainer.hpp

src/Plugin.hpp

src/RegExp.cpp

src/RegExp.hpp

src/Socket.cpp

src/Socket.hpp

src/SocketArray.cpp

src/SocketArray.hpp

src/String.cpp

src/String.hpp

src/SysV.cpp

src/SysV.hpp

src/UDSocket.cpp

src/UDSocket.hpp

src/authplugins/digest.cpp

src/authplugins/ident.cpp

src/authplugins/ip.cpp

src/authplugins/ntlm.cpp

src/authplugins/proxy.cpp

src/contentscanners/clamav.cpp

src/contentscanners/clamdscan.cpp

src/contentscanners/commandlinescan.cpp

src/contentscanners/icapscan.cpp

src/contentscanners/kavdscan.cpp

src/dansguardian.cpp

src/downloadmanagers/default.cpp

src/downloadmanagers/fancy.cpp

src/downloadmanagers/trickle.cpp

src/md5.cpp

Show diffs side-by-side

added added

removed removed

src/HTMLTemplate.cpp

22

22

23

23

// INCLUDES

24

24

25

#include "platform.h"

26

25

#ifdef HAVE_CONFIG_H

26

#include "dgconfig.h"

27

#endif

27

28

#include "HTMLTemplate.hpp"

28

29

#include "RegExp.hpp"

29

30

#include "String.hpp"

71

72

unsigned int offset;

72

73

String result;

73

74

String line;

74

std::ifstream templatefile(filename, ios::in); // dansguardian.conf

75

std::ifstream templatefile(filename, std::ios::in); // dansguardian.conf

75

76

if (!templatefile.good()) {

76

77

if (!is_daemonised) {

77

78

std::cerr << "error reading: " << filename << std::endl;

Older »