Attachment #2393 for bug #14165

View | Details | Raw Unified | Return to bug 14165
Collapse All | Expand All




            firstRunWizard();
        }

	activityviewer = new Activityviewer(this);

	klamscan = new Klamscan(this);
	tab->addTab(klamscan, i18n("&Scan"));

	// catch defaults
	config->setGroup("Klamscan");

	mArcLimits.files = QString(config->readEntry("NoFilesToExtract")).toInt();
	mArcLimits.filesize = QString(config->readEntry("MBsToExtract")).replace("M","").toInt();
	mArcLimits.ratio = QString(config->readEntry("CompressionRatio")).toInt();
	mArcLimits.reclevel = QString(config->readEntry("RecursionLevel")).toInt();

	KlamavConfig::setArcLimits(&mArcLimits);

	activityviewer = new Activityviewer(this);

	klamd = new Klamd(this);
	tab->addTab(klamd, i18n("&Auto-Scan"));


Line 0 Link Here

(-)klamav-0.41.1/src/arclimits.h.maximum (+11 lines)
	1	#ifndef ARCLIMITS_H
	2	#define ARCLIMITS_H
	3
	4	struct arclimits {
	5	int filesize;
	6	int reclevel;
	7	int files;
	8	int ratio;
	9	};
	10
	11	#endif // ARCLIMITS_H





#include <kstaticdeleter.h>

arclimits *mArcLimits = NULL;
KlamavConfig *KlamavConfig::mSelf = 0;
static KStaticDeleter<KlamavConfig> staticKlamavConfigDeleter;

KlamavConfig *KlamavConfig::setArcLimits(arclimits *pArcLimits)
{
    mArcLimits = pArcLimits;
}

KlamavConfig *KlamavConfig::self()
{
  if ( !mSelf ) {

  setCurrentGroup( QString::fromLatin1( "ArchiveLimits" ) );

  KConfigSkeleton::ItemInt  *itemCompressionRatio;
  itemCompressionRatio = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "CompressionRatio" ), mCompressionRatio, mArcLimits == NULL ? 0 : mArcLimits->ratio );
  addItem( itemCompressionRatio, QString::fromLatin1( "CompressionRatio" ) );
  KConfigSkeleton::ItemInt  *itemRecursionLevel;
  itemRecursionLevel = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "RecursionLevel" ), mRecursionLevel, mArcLimits == NULL ? 0 : mArcLimits->reclevel );
  addItem( itemRecursionLevel, QString::fromLatin1( "RecursionLevel" ) );
  KConfigSkeleton::ItemInt  *itemMBsToExtract;
  itemMBsToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "MBsToExtract" ), mMBsToExtract, mArcLimits == NULL ? 0 : mArcLimits->filesize );
  addItem( itemMBsToExtract, QString::fromLatin1( "MBsToExtract" ) );
  KConfigSkeleton::ItemInt  *itemNoFilesToExtract;
  itemNoFilesToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "NoFilesToExtract" ), mNoFilesToExtract, mArcLimits == NULL ? 0 : mArcLimits->files );
  addItem( itemNoFilesToExtract, QString::fromLatin1( "NoFilesToExtract" ) );
  KConfigSkeleton::ItemBool  *itemVirusLimitsExceeded;
  itemVirusLimitsExceeded = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "VirusLimitsExceeded" ), mVirusLimitsExceeded, true );




    //config->setGroup("Klamscan");


    // Should override clamav defaults
    //if (KlamavConfig::noFilesToExtract() > 0)
        options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";

    //if (KlamavConfig::mBsToExtract() > 0)
        options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
        
    //if (KlamavConfig::compressionRatio() > 0)
        options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";

    //if (KlamavConfig::recursionLevel() > 0)
        options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";



Lines 6-15 Link Here

(-)klamav-0.41.1/src/klamavconfig.h.maximum (+3 lines)
6	#include <kconfigskeleton.h>	6	#include <kconfigskeleton.h>
7	#include <kdebug.h>	7	#include <kdebug.h>
8		8
		9	#include "arclimits.h"
		10
9	class KlamavConfig : public KConfigSkeleton	11	class KlamavConfig : public KConfigSkeleton
10	{	12	{
11	public:	13	public:
12		14
		15	static KlamavConfig setArcLimits(arclimits pArcLimits = NULL);
13	static KlamavConfig *self();	16	static KlamavConfig *self();
14	~KlamavConfig();	17	~KlamavConfig();
15		18

Lines 15-20 Link Here

(-)klamav-0.41.1/src/klamav.h.maximum (+3 lines)
15		15
16	#include <stdlib.h>	16	#include <stdlib.h>
17		17
		18	#include "arclimits.h"
		19
18	class KPrinter;	20	class KPrinter;
19	class KToggleAction;	21	class KToggleAction;
20	class KURL;	22	class KURL;
Lines 126-131 private: Link Here
126		128
127	private:	129	private:
128	//KlamavView *m_view;	130	//KlamavView *m_view;
		131	arclimits mArcLimits;
129		132
130		133
131		134

Return to bug 14165

Lines 83-93 Klamav::Klamav() Link Here

(-)klamav-0.41.1/src/klamav.cpp.maximum (-2 / +12 lines)
83	firstRunWizard();	83	firstRunWizard();
84	}	84	}
85		85
86	activityviewer = new Activityviewer(this);
87
88	klamscan = new Klamscan(this);	86	klamscan = new Klamscan(this);
89	tab->addTab(klamscan, i18n("&Scan"));	87	tab->addTab(klamscan, i18n("&Scan"));
90		88
		89	// catch defaults
		90	config->setGroup("Klamscan");
		91
		92	mArcLimits.files = QString(config->readEntry("NoFilesToExtract")).toInt();
		93	mArcLimits.filesize = QString(config->readEntry("MBsToExtract")).replace("M","").toInt();
		94	mArcLimits.ratio = QString(config->readEntry("CompressionRatio")).toInt();
		95	mArcLimits.reclevel = QString(config->readEntry("RecursionLevel")).toInt();
		96
		97	KlamavConfig::setArcLimits(&mArcLimits);
		98
		99	activityviewer = new Activityviewer(this);
		100
91	klamd = new Klamd(this);	101	klamd = new Klamd(this);
92	tab->addTab(klamd, i18n("&Auto-Scan"));	102	tab->addTab(klamd, i18n("&Auto-Scan"));
93		103

Lines 389-404 void ScanViewer::slotScan(const QStringL Link Here

(-)klamav-0.41.1/src/scanviewer.cpp.maximum (-4 / +5 lines)
389	//config->setGroup("Klamscan");	389	//config->setGroup("Klamscan");
390		390
391		391
392	if (KlamavConfig::noFilesToExtract() > 0)	392	// Should override clamav defaults
		393	//if (KlamavConfig::noFilesToExtract() > 0)
393	options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";	394	options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
394		395
395	if (KlamavConfig::mBsToExtract() > 0)	396	//if (KlamavConfig::mBsToExtract() > 0)
396	options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";	397	options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
397		398
398	if (KlamavConfig::compressionRatio() > 0)	399	//if (KlamavConfig::compressionRatio() > 0)
399	options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";	400	options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
400		401
401	if (KlamavConfig::recursionLevel() > 0)	402	//if (KlamavConfig::recursionLevel() > 0)
402	options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";	403	options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
403		404
404		405

Lines 5-13 Link Here

(-)klamav-0.41.1/src/klamavconfig.cpp.maximum (-4 / +10 lines)
5		5
6	#include <kstaticdeleter.h>	6	#include <kstaticdeleter.h>
7		7
		8	arclimits *mArcLimits = NULL;
8	KlamavConfig *KlamavConfig::mSelf = 0;	9	KlamavConfig *KlamavConfig::mSelf = 0;
9	static KStaticDeleter<KlamavConfig> staticKlamavConfigDeleter;	10	static KStaticDeleter<KlamavConfig> staticKlamavConfigDeleter;
10		11
		12	KlamavConfig KlamavConfig::setArcLimits(arclimits pArcLimits)
		13	{
		14	mArcLimits = pArcLimits;
		15	}
		16
11	KlamavConfig *KlamavConfig::self()	17	KlamavConfig *KlamavConfig::self()
12	{	18	{
13	if ( !mSelf ) {	19	if ( !mSelf ) {
Lines 25-40 KlamavConfig::KlamavConfig( ) Link Here
25	setCurrentGroup( QString::fromLatin1( "ArchiveLimits" ) );	31	setCurrentGroup( QString::fromLatin1( "ArchiveLimits" ) );
26		32
27	KConfigSkeleton::ItemInt *itemCompressionRatio;	33	KConfigSkeleton::ItemInt *itemCompressionRatio;
28	itemCompressionRatio = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "CompressionRatio" ), mCompressionRatio, 0 );	34	itemCompressionRatio = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "CompressionRatio" ), mCompressionRatio, mArcLimits == NULL ? 0 : mArcLimits->ratio );
29	addItem( itemCompressionRatio, QString::fromLatin1( "CompressionRatio" ) );	35	addItem( itemCompressionRatio, QString::fromLatin1( "CompressionRatio" ) );
30	KConfigSkeleton::ItemInt *itemRecursionLevel;	36	KConfigSkeleton::ItemInt *itemRecursionLevel;
31	itemRecursionLevel = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "RecursionLevel" ), mRecursionLevel, 0 );	37	itemRecursionLevel = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "RecursionLevel" ), mRecursionLevel, mArcLimits == NULL ? 0 : mArcLimits->reclevel );
32	addItem( itemRecursionLevel, QString::fromLatin1( "RecursionLevel" ) );	38	addItem( itemRecursionLevel, QString::fromLatin1( "RecursionLevel" ) );
33	KConfigSkeleton::ItemInt *itemMBsToExtract;	39	KConfigSkeleton::ItemInt *itemMBsToExtract;
34	itemMBsToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "MBsToExtract" ), mMBsToExtract, 0 );	40	itemMBsToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "MBsToExtract" ), mMBsToExtract, mArcLimits == NULL ? 0 : mArcLimits->filesize );
35	addItem( itemMBsToExtract, QString::fromLatin1( "MBsToExtract" ) );	41	addItem( itemMBsToExtract, QString::fromLatin1( "MBsToExtract" ) );
36	KConfigSkeleton::ItemInt *itemNoFilesToExtract;	42	KConfigSkeleton::ItemInt *itemNoFilesToExtract;
37	itemNoFilesToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "NoFilesToExtract" ), mNoFilesToExtract, 0 );	43	itemNoFilesToExtract = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "NoFilesToExtract" ), mNoFilesToExtract, mArcLimits == NULL ? 0 : mArcLimits->files );
38	addItem( itemNoFilesToExtract, QString::fromLatin1( "NoFilesToExtract" ) );	44	addItem( itemNoFilesToExtract, QString::fromLatin1( "NoFilesToExtract" ) );
39	KConfigSkeleton::ItemBool *itemVirusLimitsExceeded;	45	KConfigSkeleton::ItemBool *itemVirusLimitsExceeded;
40	itemVirusLimitsExceeded = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "VirusLimitsExceeded" ), mVirusLimitsExceeded, true );	46	itemVirusLimitsExceeded = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "VirusLimitsExceeded" ), mVirusLimitsExceeded, true );