Commit Graph

682 Commits (234737c3f398794c7157dad2a462fe9d98f6e956)

Author SHA1 Message Date
Noud de Brouwer 234737c3f3 DB
give MYSQL.txt the correct .sql extension.
2012-12-19 13:02:03 +00:00
Noud de Brouwer 534948efad Sanitize
Sanitize countermeasures.
2012-12-19 12:56:42 +00:00
Noud de Brouwer 95158d2ef3 Sanitize
Sanitize countermeasures.
2012-12-19 12:42:38 +00:00
Andras Iklody 29cc79255f Added validation field to the event index
A small image at the front of each line showing whether the event has been
validated (published) or not. The images are placeholders for now.
2012-12-19 13:13:39 +01:00
Noud de Brouwer a8434d4830 Sanitize
Sanitize countermeasures.
2012-12-19 12:13:37 +00:00
Noud de Brouwer eb39796472 DB
clean up conversion.
2012-12-19 12:12:33 +00:00
Noud de Brouwer df67254e13 HTML
make Pages/using_the_system.ctp valid HTML.
2012-12-19 12:02:44 +00:00
Noud de Brouwer 0c1dd9b0ab HTML
make Events/view.ctp valid HTML.
2012-12-19 11:41:02 +00:00
Noud de Brouwer 71dea125ae Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop 2012-12-19 10:35:07 +00:00
Charlie Root e474b8e189 generateAllFor<FieldName>
conflicts with CAKE/Model/Model::_call() so no findBy<FieldName>.
(and various very minor other things.)
2012-12-19 10:30:10 +00:00
Andras Iklody 2497f87a41 Removed option "Sandbox" from analysis 2012-12-19 10:21:34 +01:00
Noud de Brouwer b78251d5f0 JQuery
deactivateButtons.js was bad and is not used anymore, so removed.
2012-12-19 03:23:20 +00:00
Noud de Brouwer 47aefdc109 JQuery
version was bumped but actual file not removed.
2012-12-19 03:20:23 +00:00
Noud de Brouwer 3ef56ab1bd Static program analysis
New Static program analysis Makefile for f.i. Coding Standards with reports in app/build.
2012-12-19 03:08:52 +00:00
Noud de Brouwer 5ecbfd1bbf coding standards
Coding Standards.
2012-12-19 02:57:30 +00:00
Noud de Brouwer afd7977929 coding standards
Coding Standards.
2012-12-19 02:33:09 +00:00
Noud de Brouwer 9ca03f1f37 coding standards
Coding Standards.
2012-12-19 01:48:53 +00:00
Noud de Brouwer 31207a5696 coding standards
Coding Standards typo.
2012-12-18 20:45:57 +00:00
Noud de Brouwer 5b806d36f7 coding standards
Coding Standards.
2012-12-18 19:55:50 +00:00
Noud de Brouwer 0e668e6b90 coding standards
Coding Standards.
2012-12-18 19:51:42 +00:00
Noud de Brouwer 2643da164c coding standards
Coding Standards.
2012-12-18 19:36:34 +00:00
Noud de Brouwer 4f629ecc8d coding standards
Coding Standards work file.
2012-12-18 19:26:58 +00:00
Noud de Brouwer ea9aa8eb3a coding standards
Coding Standards.
2012-12-18 19:25:12 +00:00
Noud de Brouwer d89ab91dee coding standards
Coding Standards.
2012-12-18 16:44:07 +00:00
Noud de Brouwer df74ac1cc8 PHP
lcfirst (PHP 5 >= 5.3.0).
2012-12-18 08:38:29 +00:00
Noud de Brouwer fea8450388 generateAllFor<FieldName>
missed adding app/Lib/CamelCase.php and app/Config/routes.php.
2012-12-18 08:03:01 +00:00
Noud de Brouwer 8ca550cbe1 event.analysis
set analysis* in view().
2012-12-18 03:59:45 +00:00
Noud de Brouwer b5205163fd paging
6 (used during test) -> 60 again.
2012-12-18 03:54:31 +00:00
Noud de Brouwer 8864ee78f7 generateAllFor<FieldName>
so we can use an URL like:
http://localhost/<TableName>/generateAllFor<FieldName>/newValue/oldValue
for example:
http://localhost/events/generateAllForAnalysis/0/null
http://localhost/users/generateAllForInvitedBy/1/0
http://localhost/users/generateAllForRoleId/1/0
2012-12-18 03:50:52 +00:00
Noud de Brouwer 68617350e8 Sanitize
Sanitize::clean() but redo the info and value fields.
2012-12-18 03:18:48 +00:00
Noud de Brouwer 9211e4d405 search
After added feedback on entered search terms for search attributes
and search logs, this now also works for LogsController::index()
and next and previous page.

Signed-off-by: Noud de Brouwer <noud4@home.nl>
2012-12-18 03:01:02 +00:00
Noud de Brouwer d5bcee63af Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop 2012-12-17 17:35:01 +00:00
Noud de Brouwer 8c7f8921a7 Sanitize
do not Sanitize::clean() $this->request->data.
2012-12-17 17:33:21 +00:00
Andras Iklody 38506ecaf8 Added missing 4th option to analysis levels 2012-12-17 17:52:30 +01:00
Andras Iklody 716559d5e3 added a missing view for password changes 2012-12-17 17:37:37 +01:00
Andras Iklody 7def9f6afc Fixed an issue with the events 2012-12-17 17:31:10 +01:00
Andras Iklody 099e5d92be Fix for the Attributes 2012-12-17 17:21:57 +01:00
Noud de Brouwer 46ab0d2e58 sanitize
small correction on a "\n" in info.
2012-12-17 15:51:14 +00:00
Andras Iklody b6807708ee 2 SQL files missing
- added them now
2012-12-17 16:03:10 +01:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
2012-12-17 15:51:30 +01:00
noud 9e9f34cb58 Merge branch 'master' into develop 2012-12-13 16:26:29 +01:00
noud 5ae254792c oeps
leftover debug() removed.
2012-12-13 16:25:53 +01:00
noud 2903493205 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
2012-12-13 16:03:35 +01:00
noud 276cb5df10 RESTfull sync
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)

both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
2012-12-13 15:52:00 +01:00
noud 094719fa01 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Event.php
2012-12-12 18:01:39 +01:00
noud dad39083cf CakePHP
CakePHP update from 2.2.3 to 2.2.4
2012-12-12 16:51:02 +01:00
noud b4711463f8 JQuery
bump JQuery from 1.8.2(.min) to 1.8.3(.min).
2012-12-12 16:30:19 +01:00
noud f8d277cee6 ExtJs
reverted, cause no need.
was:
does not show on production.
this is the ExtJs not being there?
or php (>5.2.8) not build without --disable-json.
2012-12-12 16:23:28 +01:00
noud 1dbb03a181 Role
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:19:49 +01:00
noud 26c8ad57ee Role
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:15:01 +01:00