Changeset 13119

Timestamp:

10/26/07 21:59:27 (1 year ago)

Author:

flack

Message:

removed htmlarea

Files:

• trunk/midcom/midcom.core/midcom/application.php (modified) (44 diffs)
• trunk/midcom/midcom.helper.datamanager/datamanager.php (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager/documentation/midcom.helper.datamanger.widget_html.example (deleted)
• trunk/midcom/midcom.helper.datamanager/static/columned.css (modified) (2 diffs)
• trunk/midcom/midcom.helper.datamanager/static/datamanager.css (modified) (1 diff)
• trunk/midcom/midcom.helper.datamanager/static/htmlarea (deleted)
• trunk/midcom/midcom.helper.datamanager/widget_html.php (deleted)
• trunk/support/clean_files.php (modified) (3 diffs)

trunk/midcom/midcom.core/midcom/application.php

@@ -105 +105 @@
- * @package midcom
- */
- 
+
-{
-    /**
@@ -301 +301 @@
-     */
-    private $_jquery_enabled = false;
-
+
-    private $_jquery_init_scripts = '';
-
+
-    /**
-     * Array with all JQuery state scripts for the page's head.
@@ -419 +419 @@
-
-        $this->_status = MIDCOM_STATUS_PREPARE;
-
+
-        // Load the services that are always needed, including the serviceloader
-        $this->_load_core_services();
-
+
-        // Start-up some of the services
-        $this->auth->initialize();
@@ -483 +483 @@
-        $this->style = new midcom_helper__styleloader();
-        $this->auth = new midcom_services_auth();
-
+
-        // These can be refactored behind serviceloader
-    
+
-        $this->tmp = new midcom_services_tmp();
-        $this->toolbars = new midcom_services_toolbars();
@@ -492 +492 @@
-        $this->_services['rcs'] = new midcom_services_rcs($GLOBALS['midcom_config']);
-    }
-
+
-    /**
-     * Load core DBA classes
@@ -544 +544 @@
-     * @see midcom_application::_process()
-     */
- 
+
-    {
-        if ($this->get_current_context() == 0)
-    
+
-            // Initialize the UI message stack from session
-            $this->uimessages->initialize();
@@ -555 +555 @@
-        $this->_parser = $this->serviceloader->load('midcom_core_service_urlparser');
-        $this->_parser->parse($GLOBALS['midgard']->argv);
-
- 
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -565 +565 @@
-
-        $this->_process();
-
+
-        if ($this->get_current_context() == 0)
-        {
@@ -579 +579 @@
-     * Style template, usually <(content)>.
-     */
- 
-
-
-
-
-    
+
+
+
+
+
+
-
-        // Enter Context
@@ -673 +673 @@
-     * @return int                        The ID of the newly created context.
-     */
- 
+
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
@@ -821 +821 @@
-                        debug_add("Substyle '$substyle' selected", MIDCOM_LOG_INFO);
-                        break;
-
+
-                    case 'serveattachmentguid':
-                    case 'serveattachment':
@@ -828 +828 @@
-                            debug_add('Too many arguments remaining for serve_attachment.', MIDCOM_LOG_ERROR);
-                        }
-
+
-                        debug_add("Trying to serve Attachment with GUID {$value}", MIDCOM_LOG_INFO);
-
+
-                        $attachment = new midcom_baseclasses_database_attachment($value);
-                        if (   !$attachment
@@ -837 +837 @@
-                            $this->generate_error(MIDCOM_ERRNOTFOUND, 'Failed to access attachment: ' . mgd_errstr());
-                        }
-
+
-                        if (!$attachment->can_do('midgard:autoserve_attachment'))
-                        {
-                            $this->generate_error(MIDCOM_ERRNOTFOUND, 'Failed to access attachment: Autoserving denied.');
-                        }
-
+
-                        $this->serve_attachment($attachment);
-                        $this->finish();
-                        exit();
-
+
-                    case 'permalink':
-                        $guid = $value;
@@ -855 +855 @@
-                            // This will exit;
-                        }
-
+
-                        // We use "302 Found" here so that search engines and others will keep using the PermaLink instead of the temporary
-                        $this->header("Location: {$destination}", 302);
-                        $this->finish();
-                        exit();
-
+
-                    case 'cache':
-                        if ($value == 'invalidate')
@@ -880 +880 @@
-                        $this->auth->logout();
-                        // This will exit;
-
+
-                    case 'login':
-                        // Value is ignored
@@ -902 +902 @@
-                        $this->_showdebuglog($value);
-                        break;
-
+
-                    default:
-                        debug_add("Unknown MidCOM URL Property ignored: {$key} => {$value}", MIDCOM_LOG_WARN);
@@ -913 +913 @@
-        $this->_status = MIDCOM_STATUS_CANHANDLE;
-
- 
+
-        {
-            $object = $this->_parser->get_current_object();
@@ -921 +921 @@
-                $this->generate_error(MIDCOM_ERRCRIT, "Root node missing.");
-            }
-
+
-            if (is_a($object, 'midgard_attachment'))
-            {
@@ -929 +929 @@
-            $path = $object->component;
-
- 
+
-            {
-                debug_add("No component defined for this node.", MIDCOM_LOG_ERROR);
@@ -941 +941 @@
-            // If so, execute it, if not, continue.
-
- 
+
-            {
-                $this->_status = MIDCOM_STATUS_HANDLE;
-
-                $prefix = $this->_parser->get_url();
-
+
-                // Initialize context
-                $this->_context[$this->_currentcontext][MIDCOM_CONTEXT_ANCHORPREFIX] = $prefix;
@@ -983 +983 @@
-
-            /**
- 
+
-             * If so we should not break application now - just gracefully continue.
-             */
-
- 
+
+
-            {
-                $this->generate_error(MIDCOM_ERRNOTFOUND, "This page is not available on this server.");
@@ -1052 +1052 @@
-            $this->generate_error(MIDCOM_ERRCRIT, "Unkown Request Type encountered:"  . $this->_context[$this->current_context][MIDCOM_CONTEXT_REQUESTTYPE]);
-        }
-
+
-        $handler =& $this->componentloader->get_interface_class($path);
-
@@ -1064 +1064 @@
-            // $this->generate_error($handler->errcode($this->_currentcontext), $handler->errstr($this->_currentcontext));
-            $this->generate_error(MIDCOM_ERRCRIT, "Component $path failed to handle the request");
-
+
-            // This will exit.
-        }
@@ -1140 +1140 @@
-            $this->generate_error(MIDCOM_ERRCRIT, "Unkown Request Type encountered:" . $this->_context[$this->current_context][MIDCOM_CONTEXT_REQUESTTYPE]);
-        }
-
+
-        // Get component interface class
-        $component_interface =& $this->componentloader->get_interface_class($path);
- 
+
-        {
-            $path = 'midcom.core.nullcomponent';
@@ -1167 +1167 @@
-            return false;
-        }
-
+
-        debug_add("Component {$path} in {$object->name} will handle request.", MIDCOM_LOG_INFO);
-        debug_pop();
@@ -1184 +1184 @@
-     * @access private
-     */
- 
+
-    {
-        $path = $this->get_context_data(MIDCOM_CONTEXT_COMPONENT);
@@ -1226 +1226 @@
-            $this->generate_error(MIDCOM_ERRCRIT, "Unkown Request Type encountered:" . $this->_context[$this->current_context][MIDCOM_CONTEXT_REQUESTTYPE]);
-        }
-
+
-        $component =& $this->componentloader->get_interface_class($this->get_context_data(MIDCOM_CONTEXT_COMPONENT));
-        $component->show_content($this->_currentcontext);
@@ -1378 +1378 @@
-     * @return midcom_helper__componentloader The reference of the component loader in use.
-     */
- 
+
-    {
-        return $this->componentloader;
@@ -1450 +1450 @@
-            $key = $param2;
-        }
-
+
-        if (!is_array($this->_context))
-        {
@@ -1492 +1492 @@
-     * @access private
-     */
- 
+
-    {
-        if (is_null($param2))
@@ -1837 +1837 @@
-     * @param integer $response_code HTTP response code to send with the header
-     */
- 
+
-    {
-        $this->cache->content->register_sent_header($header);
-
+
-        if (!is_null($response_code))
-        {
@@ -2033 +2033 @@
-                $code = 200;
-                break;
-
+
-            case MIDCOM_ERRNOTFOUND:
-                $header = "HTTP/1.0 404 Not Found";
@@ -2302 +2302 @@
-        fpassthru($f);
-        $attachment->close();
-
+
-        //$this->exit();
-        exit();
@@ -2417 +2417 @@
-    function add_jsfile($url, $prepend = false)
-    {
-htmlarea
+tinymce
-        // like call. $url is inserted into src. Duplicates are omitted.
-        if (! in_array($url, $this->_jsfiles))
@@ -2467 +2467 @@
-        if ($prepend)
-        {
-            
+
-        }
-        else
@@ -2579 +2579 @@
-            return false;
-        }
-
+
-        if (!array_key_exists('href', $attributes))
-        {
-            return false;
-        }
-
+
-        // Register each URL only once
-        if (in_array($attributes['href'], $this->_linkhrefs))
@@ -2591 +2591 @@
-        }
-        $this->_linkhrefs[] = $attributes['href'];
-
+
-        $output = '';
-
+
-        if (array_key_exists('condition', $attributes))
-        {
-            $this->_link_head .= "<!--[if {$attributes['condition']}]>\n";
-        }
-
+
-        foreach ($attributes as $key => $val)
-        {
-            if ($key != 'conditions')
-            {
-                
+
-            }
-        }
@@ -2713 +2713 @@
-            echo $this->_jquery_init_scripts;
-        }
-
+
-        if (!empty($this->_prepend_jshead))
-        {
@@ -2719 +2719 @@
-            {
-                echo $js_call;
-           
-
-
+
+
+
-        echo $this->_link_head;
-        echo $this->_object_head;
@@ -2745 +2745 @@
-            return;
-        }
-
+
-        $url = MIDCOM_STATIC_URL . "/jQuery/jquery-{$version}.js";
-        $this->_jquery_init_scripts = '<script type="text/javascript" src="' . $url . '"></script>' . "\n";
-
+
-        $script = 'var $j = jQuery.noConflict();'."\n";
-        $script .= "var MIDCOM_STATIC_URL = '" . MIDCOM_STATIC_URL . "';\n";
@@ -2756 +2756 @@
-        $this->_jquery_init_scripts .= trim($script) . "\n";
-        $this->_jquery_init_scripts .= "</script>\n";
-
+
-        $this->_jquery_enabled = true;
-    }
@@ -2776 +2776 @@
-            return;
-        }
-
+
-        echo '<script type="text/javascript">' . "\n";
-
+
-        foreach ($this->_jquery_states as $status => $scripts)
-        {
@@ -2786 +2786 @@
-            echo "\n" . '$j(' . $status_target . ').' . $status_method . '(function() {'."\n";
-            echo $scripts;
-           
+
-        }
-
@@ -2915 +2915 @@
-        $view_toolbar =& $this->toolbars->get_view_toolbar($this->_currentcontext);
-        $view_toolbar->bind_to($object);
-
+
-        // Bind the object to the metadata service
-        $this->metadata->bind_metadata_to_object(MIDCOM_METADATA_VIEW, $object, $this->_currentcontext);
-        $this->metadata->set_page_class($page_class, $this->_currentcontext);
-
+
-        $this->substyle_append($page_class);
-    }

trunk/midcom/midcom.helper.datamanager/datamanager.php

@@ -257 +257 @@
- * bulk uploads.
- *
- *
- * <b>Copyright references:</b>
- *
- * HTMLAREA, copyright (c) 2002-2004,
- * interactivetools.com, inc.
- * HTMLAREA is available under a BSD-derived license. More information
- * at http://www.interactivetools.com/products/htmlarea/license.html
- *
- * The DHTML Calendar, version 0.9.6 "Keep cool but don't freeze"
- * Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- *
- * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- *
- * @package midcom.helper.datamanager

trunk/midcom/midcom.helper.datamanager/static/columned.css

@@ -46 +46 @@
-
-/* Normal content entry */
-.htmlarea, form.datamanager 
+
-{
-    font-size: 1.15em;
@@ -57 +57 @@
-{
-    width: 20%;
-}
-form.datamanager .htmlarea
-{
-    margin-left: 10%;
-}
-form.datamanager textarea.longtext

trunk/midcom/midcom.helper.datamanager/static/datamanager.css

@@ -13 +13 @@
-
-@import "../midcom.helper.datamanager/jscript-calendar/jscalendar.css";
-@import "../midcom.helper.datamanager/htmlarea/htmlarea.css";
-
-
-form.datamanager label 

trunk/support/clean_files.php

@@ -39 +39 @@
-        '/config\.inc$/',
-        // skip 3rd party DM1/2 plugins
-htmlarea|
+
-    );
-
@@ -71 +71 @@
-        return preg_replace("/[ \t]+$/m", '', $data);
-    }
-
+
-    function walk_dir($dir)
-    {
@@ -97 +97 @@
-                }
-            }
-
+
-            echo "processing {$path}\n";
-            if (!is_readable($path))