MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

CakePHP 

To be able to update CakePHP (regularly),
we found the current differences and now
put these diffs to build/patches.

Patches are now relative to $CakePHP_HOME.
pull/61/head
noud 2012-09-25 11:22:12 +02:00
parent be4b445c11
commit c305af94e9
14 changed files with 310 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/PagesController.php.diff
View File

@ -1,5 +1,5 @@
--- PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200
+++ PagesController.php 2012-09-06 13:45:13.023544947 +0200
--- app/Controller/PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200
+++ app/Controller/PagesController.php 2012-09-06 13:45:13.023544947 +0200
@@ -52,6 +52,9 @@
*/
public $uses = array();

4
app/View/Helper/AppHelper.php.diff
View File

@ -1,5 +1,5 @@
--- AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200
+++ AppHelper.php 2012-09-06 13:45:12.791544951 +0200
--- app/View/Helper/AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200
+++ app/View/Helper/AppHelper.php 2012-09-06 13:45:12.791544951 +0200
@@ -31,4 +31,10 @@
* @package app.View.Helper
*/

4
app/View/Layouts/Emails/html/default.ctp.diff
View File

@ -1,5 +1,5 @@
--- default.ctp.orig 2012-09-20 15:29:11.952649256 +0200
+++ default.ctp 2012-09-06 13:45:13.079544947 +0200
--- app/View/Layouts/Emails/html/default.ctp.orig 2012-09-20 15:29:11.952649256 +0200
+++ app/View/Layouts/Emails/html/default.ctp 2012-09-06 13:45:13.079544947 +0200
@@ -24,6 +24,5 @@
<body>
<?php echo $content_for_layout;?>

4
app/View/Layouts/Emails/text/default.ctp.diff
View File

@ -1,5 +1,5 @@
--- default.ctp.orig 2012-09-20 15:29:00.464648980 +0200
+++ default.ctp 2012-09-06 13:45:12.635544956 +0200
--- app/View/Layouts/Emails/text/default.ctp.orig 2012-09-20 15:29:00.464648980 +0200
+++ app/View/Layouts/Emails/text/default.ctp 2012-09-06 13:45:12.635544956 +0200
@@ -17,5 +17,3 @@
*/
?>

4
app/View/Layouts/default.ctp.diff
View File

@ -1,5 +1,5 @@
--- default.ctp.orig 2012-09-20 15:35:36.384658456 +0200
+++ default.ctp 2012-09-20 15:36:38.128659936 +0200
--- app/View/Layouts/default.ctp.orig 2012-09-20 15:35:36.384658456 +0200
+++ app/View/Layouts/default.ctp 2012-09-20 15:36:38.128659936 +0200
@@ -16,44 +16,53 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

7
app/webroot/css/cake.generic.css.diff
View File

@ -1,5 +1,8 @@
--- cake.generic.css.orig 2012-09-20 15:53:24.716684032 +0200
+++ cake.generic.css 2012-09-20 14:00:58.772522542 +0200
This one has to be checked..given i think it's not updated the previous CakePHP update.
--- app/webroot/css/cake.generic.css.orig 2012-09-20 15:53:24.716684032 +0200
+++ app/webroot/css/cake.generic.css 2012-09-20 14:00:58.772522542 +0200
@@ -4,12 +4,12 @@
* Generic CSS for CakePHP
*

4
app/webroot/index.php.diff
View File

@ -1,5 +1,5 @@
--- index.php.orig 2012-09-20 15:51:02.508680629 +0200
+++ index.php 2012-09-06 13:45:12.555544956 +0200
--- app/webroot/index.php.orig 2012-09-20 15:51:02.508680629 +0200
+++ app/webroot/index.php 2012-09-06 13:45:12.555544956 +0200
@@ -86,6 +86,10 @@
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
}

12
build/patches/app_Controller_PagesController.php.diff Normal file
View File

@ -0,0 +1,12 @@
--- app/Controller/PagesController.php.orig 2012-09-20 15:44:21.264671022 +0200
+++ app/Controller/PagesController.php 2012-09-06 13:45:13.023544947 +0200
@@ -52,6 +52,9 @@
*/
public $uses = array();
+ public function isAuthorized($user) {
+ return true;
+ }
/**
* Displays a view
*

13
build/patches/app_View_Helper_AppHelper.php.diff Normal file
View File

@ -0,0 +1,13 @@
--- app/View/Helper/AppHelper.php.orig 2012-09-20 15:32:09.844653514 +0200
+++ app/View/Helper/AppHelper.php 2012-09-06 13:45:12.791544951 +0200
@@ -31,4 +31,10 @@
* @package app.View.Helper
*/
class AppHelper extends Helper {
+ function url($url = null, $full = false) {
+ if(is_array($url) && !isset($url['admin'])){
+ $url['admin'] = false;
+ }
+ return parent::url($url, $full);
+ }
}

10
build/patches/app_View_Layouts_Emails_html_default.ctp.diff Normal file
View File

@ -0,0 +1,10 @@
--- app/View/Layouts/Emails/html/default.ctp.orig 2012-09-20 15:29:11.952649256 +0200
+++ app/View/Layouts/Emails/html/default.ctp 2012-09-06 13:45:13.079544947 +0200
@@ -24,6 +24,5 @@
<body>
<?php echo $content_for_layout;?>
- <p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
</body>
</html>
\ No newline at end of file

8
build/patches/app_View_Layouts_Emails_text_default.ctp.diff Normal file
View File

@ -0,0 +1,8 @@
--- app/View/Layouts/Emails/text/default.ctp.orig 2012-09-20 15:29:00.464648980 +0200
+++ app/View/Layouts/Emails/text/default.ctp 2012-09-06 13:45:12.635544956 +0200
@@ -17,5 +17,3 @@
*/
?>
<?php echo $content_for_layout;?>
-
-This email was sent using the CakePHP Framework, http://cakephp.org.

66
build/patches/app_View_Layouts_default.ctp.diff Normal file
View File

@ -0,0 +1,66 @@
--- app/View/Layouts/default.ctp.orig 2012-09-20 15:35:36.384658456 +0200
+++ app/View/Layouts/default.ctp 2012-09-20 15:36:38.128659936 +0200
@@ -16,44 +16,53 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<?php echo $this->Html->charset(); ?>
<title>
- <?php echo $cakeDescription ?>:
+ <?php echo Configure::read('CyDefSIG.name')?>:
<?php echo $title_for_layout; ?>
</title>
<?php
echo $this->Html->meta('icon');
echo $this->Html->css('cake.generic');
+ echo $this->Html->css(array('print'), 'stylesheet', array('media' => 'print'));
echo $this->fetch('meta');
echo $this->fetch('css');
echo $this->fetch('script');
+
+ echo $this->Html->script('jquery-1.7.2.min'); // Include jQuery library
?>
</head>
<body>
<div id="container">
<div id="header">
- <h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
+ <h1><?php echo $this->Html->link(Configure::read('CyDefSIG.header'), array('controller' => 'events', 'action' => 'index')); ?>
+ <?php if($logo = Configure::read('CyDefSIG.logo')) {
+ echo $this->Html->image($logo, array('alt' => h(Configure::read('CyDefSIG.header')),'align'=>'right','height'=>'30'));
+ }?></h1>
</div>
<div id="content">
-
+ <?php echo $this->Session->flash('auth'); ?>
+ <?php echo $this->Session->flash('error'); ?>
+ <?php echo $this->Session->flash('gpg'); ?>
<?php echo $this->Session->flash(); ?>
+ <?php echo $this->Session->flash('email'); ?>
+
<?php echo $this->fetch('content'); ?>
</div>
<div id="footer">
- <?php echo $this->Html->link(
- $this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
- 'http://www.cakephp.org/',
- array('target' => '_blank', 'escape' => false)
- );
- ?>
+ <div class="noprint">
+ <h1 style="float:left;">Download: <?php echo $this->Html->link('PGP/GPG key', '/gpg.asc');?></h1>
+ <h1 style="float:right;"> <?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout'));?></h1>
+ </div>
+
+ <h1 style="text-align:center;"><?php echo Configure::read('CyDefSIG.footer')?></h1>
</div>
</div>
<?php echo $this->element('sql_dump'); ?>

171
build/patches/app_webroot_css_cake.generic.css.diff Normal file
View File

@ -0,0 +1,171 @@
This one has to be checked..given i think it's not updated the previous CakePHP update.
--- app/webroot/css/cake.generic.css.orig 2012-09-20 15:53:24.716684032 +0200
+++ app/webroot/css/cake.generic.css 2012-09-20 14:00:58.772522542 +0200
@@ -4,12 +4,12 @@
* Generic CSS for CakePHP
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package app.webroot.css
* @since CakePHP(tm)
@@ -26,7 +26,7 @@
background: #003d4c;
color: #fff;
font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
- font-size:90%;
+ font-size:12px;
margin: 0;
}
a {
@@ -69,7 +69,10 @@
margin: 0 12px;
}
p {
- margin: 0 0 1em 0;
+ margin-bottom: 8px;
+}
+em {
+ font-weight: bold;
}
/** Layout **/
@@ -143,6 +146,7 @@
border-bottom:2px solid #555;
text-align: left;
padding:4px;
+ white-space: nowrap;
}
th a {
display: block;
@@ -165,13 +169,34 @@
background: #f9f9f9;
}
td.actions {
- text-align: center;
+ text-align: right;
white-space: nowrap;
+ width:5%;
}
table td.actions a {
margin: 0px 6px;
padding:2px 5px;
}
+th.actions {
+ text-align:center;
+}
+td.short {
+ width:5%;
+ white-space: nowrap;
+}
+
+/* added */
+div .events table tr:hover, div .events table tr.altrow:hover, div .attributes table tr:hover, div .attributes table tr.altrow:hover{
+ background-color: #F5F5D7;
+}
+
+table tr.altrow {
+ background: #f5f5f5;
+}
+table tr:nth-child(2n) {
+ background: #f5f5f5;
+}
+/* /added */
/* SQL log */
.cake-sql-log {
@@ -261,9 +286,9 @@
width: 95%;
}
fieldset {
- border: none;
+ border: 1px solid #ccc;
margin-bottom: 1em;
- padding: 16px 10px;
+ padding: 16px 20px;
}
fieldset legend {
color: #e32;
@@ -271,8 +296,9 @@
font-weight: bold;
}
fieldset fieldset {
- margin-top: 0;
- padding: 10px 0 0;
+ margin-top: 0px;
+ margin-bottom: 20px;
+ padding: 16px 10px;
}
fieldset fieldset legend {
font-size: 120%;
@@ -306,26 +332,36 @@
}
label {
display: block;
- font-size: 110%;
+ font-size: 120%;
margin-bottom:3px;
}
+div.forminfo {
+ display: block;
+ float: right;
+ text-align: right;
+ font-weight:normal;
+ background-color: #fcfcb1;
+ padding: 2px 2px 2px 2px;
+ border: 1px dashed #e8e882;
+}
+
input, textarea {
clear: both;
- font-size: 140%;
+ font-size: 110%;
font-family: "frutiger linotype", "lucida grande", "verdana", sans-serif;
padding: 1%;
width:98%;
}
select {
clear: both;
- font-size: 120%;
+ font-size: 110%;
vertical-align: text-bottom;
}
select[multiple=multiple] {
width: 100%;
}
option {
- font-size: 120%;
+ font-size: 110%;
padding: 0 3px;
}
input[type=checkbox] {
@@ -340,9 +376,7 @@
input[type=radio] {
float:left;
width:auto;
- margin: 6px 0;
- padding: 0;
- line-height: 26px;
+ margin: 0 3px 7px 0;
}
.radio label {
margin: 0 0 6px 20px;
@@ -564,7 +598,8 @@
pre {
color: #000;
background: #f0f0f0;
- padding: 15px;
+ padding: 10px;
+ margin-bottom: 10px;
-moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);

13
build/patches/app_webroot_index.php.diff Normal file
View File

@ -0,0 +1,13 @@
--- app/webroot/index.php.orig 2012-09-20 15:51:02.508680629 +0200
+++ app/webroot/index.php 2012-09-06 13:45:12.555544956 +0200
@@ -86,6 +86,10 @@
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
}
+ if (isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] == '/favicon.ico') {
+ return;
+ }
+
App::uses('Dispatcher', 'Routing');
$Dispatcher = new Dispatcher();