Author: glen Date: Mon Mar 16 18:28:49 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 0.2.1
---- Files affected:
SOURCES:
roundcubemail-faq-page.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/roundcubemail-faq-page.patch
diff -u SOURCES/roundcubemail-faq-page.patch:1.1
SOURCES/roundcubemail-faq-page.patch:1.2
--- SOURCES/roundcubemail-faq-page.patch:1.1 Thu Apr 12 18:30:17 2007
+++ SOURCES/roundcubemail-faq-page.patch Mon Mar 16 19:28:43 2009
@@ -1,24 +1,46 @@
---- roundcubemail-nightly-20070318/index.php 2007-04-12 18:02:59.274319751
+0300
-+++ roundcubemail-nightly-20070318/index.php 2007-04-12 19:29:32.262254092
+0300
-@@ -47,7 +47,7 @@
- $OUTPUT_TYPE = 'html';
- $JS_OBJECT_NAME = 'rcmail';
- $INSTALL_PATH = dirname(__FILE__);
--$MAIN_TASKS = array('mail','settings','addressbook','logout');
-+$MAIN_TASKS = array('mail','settings','addressbook','logout', 'faq');
-
- if (empty($INSTALL_PATH))
- $INSTALL_PATH = './';
-@@ -187,6 +187,12 @@
- }
+--- roundcubemail-0.2.1/index.php~ 2009-03-16 20:19:56.519373134 +0200
++++ roundcubemail-0.2.1/index.php 2009-03-16 20:19:47.749882178 +0200
+@@ -122,9 +118,12 @@
+ $OUTPUT->show_message('sessionerror', 'error');
+ $RCMAIL->kill_session();
}
++}
++// faq page
++else if ($RCMAIL->task=='faq') {
++ $OUTPUT->send($RCMAIL->task);
+ }
-+// display faq template
-+if ($_task=='faq')
-+ {
-+ parse_template($_task);
-+ }
+-
+ // check client X-header to verify request origin
+ if ($OUTPUT->ajax_call) {
+ if (!$RCMAIL->config->get('devel_mode') &&
!rc_request_header('X-RoundCube-Referer')) {
+--- roundcubemail-0.2.1/program/include/rcmail.php~ 2009-03-16
20:19:56.536247276 +0200
++++ roundcubemail-0.2.1/program/include/rcmail.php 2009-03-16
19:57:08.976371859 +0200
+@@ -28,7 +28,7 @@
+ */
+ class rcmail
+ {
+- static public $main_tasks =
array('mail','settings','addressbook','login','logout');
++ static public $main_tasks =
array('mail','settings','addressbook','faq','login','logout');
+
+ static private $instance;
+
+--- /dev/null 2008-11-04 20:33:38.146691408 +0200
++++ roundcubemail-0.2.1/skins/default/templates/faq.html 2009-01-21
09:22:58.000000000 +0200
+@@ -0,0 +1,16 @@
++<!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>
++<title>RoundCube|Mail :: ERROR</title>
++<roundcube:include file="/includes/links.html" />
++</head>
++<body>
++
++<div id="header"><img src="/images/roundcube_logo.png" alt="RoundCube
Webmail" /></div>
++
++<div style="width:400px; margin:60px auto;">
++$__page_content
++</div>
+
- // end session
- else if ($_action=='logout' && isset($_SESSION['user_id']))
- {
++</body>
++</html>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/roundcubemail-faq-page.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
