Changeset 1aceb9c in github for program/include/rcube_output_html.php

Timestamp:

Apr 16, 2012 7:02:21 AM (13 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

be98dfc2

Parents:

4372e92

Message:

• Framework refactoring (I hope it's the last one): rcube,rcmail,rcube_ui -> rcube,rcmail,rcube_utils renamed main.inc into rcube_bc.inc

File:

• program/include/rcube_output_html.php (modified) (14 diffs)

program/include/rcube_output_html.php

@@ -75 +75 @@
 
         // add common javascripts
-        $this->add_script('var '.JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');
+        $this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');
 
         // don't wait for page onload. Call init at the bottom of the page (delayed)
-        $this->add_script(JS_OBJECT_NAME.'.init();', 'docready');
+        $this->add_script(rcmail::JS_OBJECT_NAME.'.init();', 'docready');
 
         $this->scripts_path = 'program/js/';
@@ -184 +184 @@
     public function add_gui_object($obj, $id)
     {
-        $this->add_script(JS_OBJECT_NAME.".gui_object('$obj', '$id');");
+        $this->add_script(rcmail::JS_OBJECT_NAME.".gui_object('$obj', '$id');");
     }
 
@@ -458 +458 @@
         $out = '';
         if (!$this->framed && !empty($this->js_env)) {
-            $out .= JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n";
+            $out .= rcmail::JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n";
         }
         if (!empty($this->js_labels)) {
@@ -471 +471 @@
             $out .= sprintf(
                 "%s.%s(%s);\n",
-                ($parent ? 'if(window.parent && parent.'.JS_OBJECT_NAME.') parent.' : '') . JS_OBJECT_NAME,
+                ($parent ? 'if(window.parent && parent.'.rcmail::JS_OBJECT_NAME.') parent.' : '') . rcmail::JS_OBJECT_NAME,
                 preg_replace('/^parent\./', '', $method),
                 implode(',', $args)
@@ -645 +645 @@
                 "\$this->app->config->get('\\1',get_boolean('\\3'))",
                 "\$this->env['\\1']",
-                "rcube_ui::get_input_value('\\1', rcube_ui::INPUT_GPC)",
+                "rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
                 "\$_COOKIE['\\1']",
                 "\$this->browser->{'\\1'}",
@@ -813 +813 @@
                         break;
                     case 'request':
-                        $value = rcube_ui::get_input_value($name, rcube_ui::INPUT_GPC);
+                        $value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
                         break;
                     case 'session':
@@ -918 +918 @@
             $this->add_script(sprintf(
                 "%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
-                JS_OBJECT_NAME,
+                rcmail::JS_OBJECT_NAME,
                 $command,
                 $attrib['id'],
@@ -930 +930 @@
             if (in_array($attrib['command'], rcmail::$main_tasks)) {
                 $attrib['href']    = $this->app->url(array('task' => $attrib['command']));
-                $attrib['onclick'] = sprintf("%s.command('switch-task','%s');return false", JS_OBJECT_NAME, $attrib['command']);
+                $attrib['onclick'] = sprintf("%s.command('switch-task','%s');return false", rcmail::JS_OBJECT_NAME, $attrib['command']);
             }
             else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
@@ -954 +954 @@
             $attrib['onclick'] = sprintf(
                 "return %s.command('%s','%s',this)",
-                JS_OBJECT_NAME,
+                rcmail::JS_OBJECT_NAME,
                 $command,
                 $attrib['prop']
@@ -1329 +1329 @@
         }
 
-        return rcube_idn_to_utf8($username);
+        return rcube_utils::idn_to_utf8($username);
     }
 
@@ -1348 +1348 @@
 
         // save original url
-        $url = rcube_ui::get_input_value('_url', rcube_ui::INPUT_POST);
+        $url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
         if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING']))
             $url = $_SERVER['QUERY_STRING'];
@@ -1398 +1398 @@
 
         $table->add('title', html::label('rcmloginuser', html::quote($this->app->gettext('username'))));
-        $table->add('input', $input_user->show(rcube_ui::get_input_value('_user', rcube_ui::INPUT_GPC)));
+        $table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));
 
         $table->add('title', html::label('rcmloginpwd', html::quote($this->app->gettext('password'))));
@@ -1406 +1406 @@
         if (is_object($input_host) && !$hide_host) {
             $table->add('title', html::label('rcmloginhost', html::quote($this->app->gettext('server'))));
-            $table->add('input', $input_host->show(rcube_ui::get_input_value('_host', rcube_ui::INPUT_GPC)));
+            $table->add('input', $input_host->show(rcube_utils::get_input_value('_host', rcube_utils::INPUT_GPC)));
         }
 
@@ -1482 +1482 @@
             $out = $this->form_tag(array(
                 'name' => "rcmqsearchform",
-                'onsubmit' => JS_OBJECT_NAME . ".command('search');return false;",
+                'onsubmit' => rcmail::JS_OBJECT_NAME . ".command('search');return false;",
                 'style' => "display:inline"),
                 $out);