OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-May-2008 23:16:02
Branch: HEAD Handle: 2008050222160000
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
FCKeditor integration improvements
Summary:
Revision Changes Path
1.6 +20 -1 openpkg-src/drupal/drupal.patch
1.225 +3 -1 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 drupal.patch
--- openpkg-src/drupal/drupal.patch 2 May 2008 19:17:58 -0000 1.5
+++ openpkg-src/drupal/drupal.patch 2 May 2008 21:16:00 -0000 1.6
@@ -330,7 +330,7 @@
--- /dev/null 2008-05-02 21:08:21 +0200
+++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56
+0200
@@ -0,0 +1,20 @@
-+/* $Id: drupal.patch,v 1.5 2008/05/02 19:17:58 rse Exp $ */
++/* $Id: drupal.patch,v 1.6 2008/05/02 21:16:00 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -368,3 +368,22 @@
$node->images[$key] = $destination;
_image_insert($node, $key, file_create_path($destination));
}
+
+-----------------------------------------------------------------------------
+
+Activate the Drupal glue code for the FCKeditor filemanager.
+
+Index:
sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php
+---
sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php.orig
2008-03-25 16:28:24 +0100
++++
sites/all/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php
2008-05-02 23:02:23 +0200
+@@ -39,6 +39,9 @@
+ // Attention: The above 'UserFilesPath' must point to the same directory.
+ $Config['UserFilesAbsolutePath'] = '' ;
+
++// activate Drupal glue code for filemanager
++require_once "../../../../../filemanager.config.php";
++
+ // Due to security issues with Apache modules, it is recommended to leave
the
+ // following setting enabled.
+ $Config['ForceSingleExtension'] = true ;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.224 -r1.225 drupal.spec
--- openpkg-src/drupal/drupal.spec 2 May 2008 20:52:36 -0000 1.224
+++ openpkg-src/drupal/drupal.spec 2 May 2008 21:16:00 -0000 1.225
@@ -191,7 +191,7 @@
%define V_theme_zen 6.x-1.x-dev
# package versions (auxilliary libraries)
-%define V_aux_fckeditor 2.6
+%define V_aux_fckeditor 2.5.1
%define V_aux_geshi 1.0.7.20
%define V_aux_simplepie 1.1
%define V_aux_tinymce 2_1_3
@@ -1448,6 +1448,8 @@
# install additional third-party files
( cd sites/all/modules/fckeditor || exit $?
%{l_tar} xfz %{SOURCE300}
+ chmod -R u+rw .
+ chmod -R a+r .
) || exit $?
( cd sites/all/modules/geshifilter || exit $?
%{l_tar} xfz %{SOURCE301}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
