xoops-cvs2 Mailing List for XOOPS Web Application System

Revision: 4068
          http://xoops.svn.sourceforge.net/xoops/?rev=4068&view=rev
Author:   beckmi
Date:     2009-12-31 16:20:58 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
Fix for bug # 2923867 

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/modules/profile/class/field.php

Modified: XoopsCore/trunk/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/class/field.php	2009-12-31 15:23:58 UTC (rev 4067)
+++ XoopsCore/trunk/htdocs/modules/profile/class/field.php	2009-12-31 16:20:58 UTC (rev 4068)
@@ -246,12 +246,12 @@
 
         switch ($this->getVar('field_type')  ) {
             default:
-            case "textbox":
-                if ( $this->getVar('field_name') == 'url' ) {
-                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
-                   } else {
-                     return $value;
-                }
+            case "textbox": 
+                if ( $this->getVar('field_name') == 'url' && $value != '') { 
+                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>'; 
+                   } else { 
+                     return $value; 
+                } 
                 break;
             case "textarea":
             case "dhtml":


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4064
          http://xoops.svn.sourceforge.net/xoops/?rev=4064&view=rev
Author:   kris_fr
Date:     2009-12-31 14:46:54 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for blockquote and code in zetagenesis

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css

Modified: XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css
===================================================================
--- XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-31 13:25:43 UTC (rev 4063)
+++ XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-31 14:46:54 UTC (rev 4064)
@@ -147,9 +147,10 @@
 }
 
 /* ===== Quote, code and signature ===== */
-.xoopsCode { display:        block;}
-.xoopsQuote { display:       block;}
+.xoopsCode {}
+.xoopsQuote {}
 blockquote {
+	display:				block;
     width:                  90%;
     margin-left:            .5em;
     background-color:       #f4faff;
@@ -161,6 +162,7 @@
     border-width:           1px 1px 1px 6px;
 }
 code {
+	display:				block;
     width:                  90%;
     max-height:             300px;
     margin-left:            .5em;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4067
          http://xoops.svn.sourceforge.net/xoops/?rev=4067&view=rev
Author:   kris_fr
Date:     2009-12-31 15:23:58 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for code in zetagenesis

Modified Paths:
--------------
    XoopsThemes/zetagenesis/trunk/css/content.css

Modified: XoopsThemes/zetagenesis/trunk/css/content.css
===================================================================
--- XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 15:23:09 UTC (rev 4066)
+++ XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 15:23:58 UTC (rev 4067)
@@ -174,7 +174,6 @@
     font-family:            monospace;
     border:                 1px solid #d0d0d0;
 }
-code, pre { white-space: -pre-wrap /* for opera */; white-space: pre-wrap;}
 .signature {
     font-size:              .9em;
     font-style:             normal;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4066
          http://xoops.svn.sourceforge.net/xoops/?rev=4066&view=rev
Author:   kris_fr
Date:     2009-12-31 15:23:09 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for code in zetagenesis

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css

Modified: XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css
===================================================================
--- XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-31 14:47:44 UTC (rev 4065)
+++ XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-31 15:23:09 UTC (rev 4066)
@@ -174,7 +174,6 @@
     font-family:            monospace;
     border:                 1px solid #d0d0d0;
 }
-code, pre { white-space: -pre-wrap /* for opera */; white-space: pre-wrap;}
 .signature {
     font-size:              .9em;
     font-style:             normal;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4065
          http://xoops.svn.sourceforge.net/xoops/?rev=4065&view=rev
Author:   kris_fr
Date:     2009-12-31 14:47:44 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for blockquote and code in zetagenesis

Modified Paths:
--------------
    XoopsThemes/zetagenesis/trunk/css/content.css

Modified: XoopsThemes/zetagenesis/trunk/css/content.css
===================================================================
--- XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 14:46:54 UTC (rev 4064)
+++ XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 14:47:44 UTC (rev 4065)
@@ -147,9 +147,10 @@
 }
 
 /* ===== Quote, code and signature ===== */
-.xoopsCode { display:        block;}
-.xoopsQuote { display:       block;}
+.xoopsCode {}
+.xoopsQuote {}
 blockquote {
+	display:				block;
     width:                  90%;
     margin-left:            .5em;
     background-color:       #f4faff;
@@ -161,6 +162,7 @@
     border-width:           1px 1px 1px 6px;
 }
 code {
+	display:				block;
     width:                  90%;
     max-height:             300px;
     margin-left:            .5em;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4063
          http://xoops.svn.sourceforge.net/xoops/?rev=4063&view=rev
Author:   kris_fr
Date:     2009-12-31 13:25:43 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for blockquote and code in zetagenesis

Modified Paths:
--------------
    XoopsThemes/zetagenesis/trunk/css/content.css

Modified: XoopsThemes/zetagenesis/trunk/css/content.css
===================================================================
--- XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 13:24:15 UTC (rev 4062)
+++ XoopsThemes/zetagenesis/trunk/css/content.css	2009-12-31 13:25:43 UTC (rev 4063)
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* ===== titles ===== */
 h1 { font-size:             1.6em;}
 h2 { font-size:             1.4em;}
@@ -149,9 +147,9 @@
 }
 
 /* ===== Quote, code and signature ===== */
-div.xoopsCode {}
-div.xoopsQuote {}
-blockquote, .xoopsQuote {
+.xoopsCode { display:        block;}
+.xoopsQuote { display:       block;}
+blockquote {
     width:                  90%;
     margin-left:            .5em;
     background-color:       #f4faff;
@@ -162,8 +160,7 @@
     border-style:           solid;
     border-width:           1px 1px 1px 6px;
 }
-.xoopsCode {
-    display:                block;
+code {
     width:                  90%;
     max-height:             300px;
     margin-left:            .5em;
@@ -175,7 +172,7 @@
     font-family:            monospace;
     border:                 1px solid #d0d0d0;
 }
-
+code, pre { white-space: -pre-wrap /* for opera */; white-space: pre-wrap;}
 .signature {
     font-size:              .9em;
     font-style:             normal;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4062
          http://xoops.svn.sourceforge.net/xoops/?rev=4062&view=rev
Author:   kris_fr
Date:     2009-12-31 13:24:15 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
css style for blockquote and code in zetagenesis

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css

Modified: XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css
===================================================================
--- XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-30 23:32:42 UTC (rev 4061)
+++ XoopsCore/trunk/htdocs/themes/zetagenesis/css/content.css	2009-12-31 13:24:15 UTC (rev 4062)
@@ -147,9 +147,9 @@
 }
 
 /* ===== Quote, code and signature ===== */
-div.xoopsCode {}
-div.xoopsQuote {}
-blockquote, .xoopsQuote {
+.xoopsCode { display:        block;}
+.xoopsQuote { display:       block;}
+blockquote {
     width:                  90%;
     margin-left:            .5em;
     background-color:       #f4faff;
@@ -160,8 +160,7 @@
     border-style:           solid;
     border-width:           1px 1px 1px 6px;
 }
-.xoopsCode {
-    display:                block;
+code {
     width:                  90%;
     max-height:             300px;
     margin-left:            .5em;
@@ -173,7 +172,7 @@
     font-family:            monospace;
     border:                 1px solid #d0d0d0;
 }
-
+code, pre { white-space: -pre-wrap /* for opera */; white-space: pre-wrap;}
 .signature {
     font-size:              .9em;
     font-style:             normal;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4061
          http://xoops.svn.sourceforge.net/xoops/?rev=4061&view=rev
Author:   beckmi
Date:     2009-12-30 23:32:42 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Updated Changelog

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-30 23:22:45 UTC (rev 4060)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-30 23:32:42 UTC (rev 4061)
@@ -5,7 +5,7 @@
 ===============================
 Updates upon community:
 - Added: Ability to assign display elements to a specific group of users (ghia)
-- Added : Smarty variable for xoops_avatar (kris_fr/trabis)
+- Added: Smarty variable for xoops_avatar (kris_fr/trabis)
 - Added: Cache supported functions: xoops_getActiveModules(), xoops_setActiveModules(), xoops_isActiveModule() (trabis)
 - Added: XoopsMailer - Adding method to set 'allow html' parameter (Wishcraft)
 - Improved: Preloads are only loaded for modules installed and active, this will reduce queries and improve performance (trabis)
@@ -15,6 +15,7 @@
 - Fixed : SQL Injection vulnerability in kernel/notification.php (trabis/secunia.com)
 
 Updates from Sourceforge trackers:
+- Fixed bug #2923867 : Website Row is displayed even value is empty (trabis/maxxy)
 - Fixed bug #2909312 : Layout of XoopsForms is changed (trabis/ghia)
 - Fixed bug #2904777 : preload including not installed module's preloads (trabis/bandit-x)
 - Fixed bug #2908887 : User can not select system avatars (trabis/ghia)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4060
          http://xoops.svn.sourceforge.net/xoops/?rev=4060&view=rev
Author:   beckmi
Date:     2009-12-30 23:22:45 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Fix for bug # 2923867 

Modified Paths:
--------------
    XoopsModules/profile/releases/1.55/profile/class/field.php

Modified: XoopsModules/profile/releases/1.55/profile/class/field.php
===================================================================
--- XoopsModules/profile/releases/1.55/profile/class/field.php	2009-12-29 15:46:27 UTC (rev 4059)
+++ XoopsModules/profile/releases/1.55/profile/class/field.php	2009-12-30 23:22:45 UTC (rev 4060)
@@ -237,12 +237,12 @@
 
         switch ($this->getVar('field_type')) {
             default:
-            case "textbox":
-                if ($this->getVar('field_name') == 'url') {
-                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
-                   } else {
-                     return $value;
-                }
+            case "textbox": 
+                if ( $this->getVar('field_name') == 'url' && $value != '') { 
+                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>'; 
+                   } else { 
+                     return $value; 
+                } 
                 break;
             case "textarea":
             case "dhtml":


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4059
          http://xoops.svn.sourceforge.net/xoops/?rev=4059&view=rev
Author:   dhcst
Date:     2009-12-29 15:46:27 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
fix problem with utf-8 in preview

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/include/formdhtmltextarea_preview.php

Modified: XoopsCore/trunk/htdocs/include/formdhtmltextarea_preview.php
===================================================================
--- XoopsCore/trunk/htdocs/include/formdhtmltextarea_preview.php	2009-12-28 21:41:33 UTC (rev 4058)
+++ XoopsCore/trunk/htdocs/include/formdhtmltextarea_preview.php	2009-12-29 15:46:27 UTC (rev 4059)
@@ -21,7 +21,7 @@
 
 $xoopsLogger->activated = false;
 $myts =& MyTextSanitizer::getInstance();
-$content = $myts->stripSlashesGPC($_GET['text']);
+$content = $myts->stripSlashesGPC(xoops_convert_encoding($_GET['text']));
 $html = empty($_GET['html']) ? 0 : 1;
 
 if (preg_match_all('/%u([[:alnum:]]{4})/', $content, $matches)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4058
          http://xoops.svn.sourceforge.net/xoops/?rev=4058&view=rev
Author:   arabxoops
Date:     2009-12-28 21:41:33 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Added XOOPS 2.4.3 arabic lang

Modified Paths:
--------------
    XoopsLanguages/arabic/core/2.4_win1256/language/arabic/banners.php
    XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php
    XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/style.css
    XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/banners.php
    XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/groups.php
    XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/admin.php
    XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/main.php
    XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/modinfo.php

Modified: XoopsLanguages/arabic/core/2.4_win1256/language/arabic/banners.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/language/arabic/banners.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/language/arabic/banners.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -71,4 +71,8 @@
 define('_BANNERS_DBUPDATED', '\xCA\xE3 \xCA\xDA\xCF\xED\xE1 \xC7\xE1\xDA\xE4\xC7\xD5\xD1 \xE6\xCA\xCD\xCF\xED\xCB \xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA');
 define('_BANNERS_DBERROR', '\xDA\xDD\xE6\xC7\xF0 .. \xE1\xE3 \xED\xCA\xE3 \xCA\xCD\xCF\xED\xCB \xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA \xE1\xE6\xCC\xE6\xCF \xCE\xD8\xC3 \xE3\xC7');
 define('_BANNERS_CHANGE', '\xCA\xDB\xED\xED\xD1');
+
+define('_BANNERS_NO_LOGIN_DATA', '\xE1\xC7 \xCA\xCA\xE6\xDD\xD1 \xC8\xED\xC7\xE4\xC7\xCA \xC7\xE1\xCF\xCE\xE6\xE1');
+define('_BANNERS_NO_REFERER', '\xE1\xC7 \xED\xCA\xE6\xDD\xD1 \xD1\xC7\xC8\xD8 \xE3\xCD\xED\xE1');
+define('_BANNERS_NO_ID', '\xE1\xC7 \xED\xCA\xE6\xDD\xD1 \xD1\xDE\xE3 \xC5\xDA\xE1\xC7\xE4 \xD5\xCD\xED\xCD');
 ?>
\ No newline at end of file

Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/admin.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -35,7 +35,7 @@
 define('_MD_OXYGEN_XOOPSFAQ','\xC3\xD3\xC6\xE1\xC9 \xE6 \xC3\xCC\xE6\xC8\xC9 \xCD\xE6\xE1 \xD2\xE6\xE6\xC8\xD3');
 define('_MD_OXYGEN_CODESVN','Code Svn');
 define('_MD_OXYGEN_REPORTBUG','Report Bug');
-define('_MD_OXYGEN_XGIFTSHOP','Xoops Gift Shop');
+define('_MD_OXYGEN_XGIFTSHOP','XOOPS Gift Shop');
 define('_MD_OXYGEN_XDONATIONS','\xC7\xE3\xE4\xCD \xE5\xC8\xC9');
 define('_MD_OXYGEN_XDONATIONS_TEXT','<h2>\xDD\xED \xCD\xC7\xCC\xC9 \xC5\xE1\xEC \xE3\xD3\xC7\xDA\xCF\xCA\xDF\xE3 - \xC7\xE3\xE4\xCD\xE6\xC7 \xCF\xDA\xE3!</h2>
 If you like the XOOPS system, and would like to give something in return, you can make a donation to the XOOPS Foundation! Simply use the PayPal payment system to transfer your donation to the Foundation account.<br> 
@@ -53,7 +53,7 @@
 define('_MD_OXYGEN_MAILER','\xCA\xE5\xED\xC6\xC9 \xC7\xE1\xC8\xD1\xED\xCF');
 define('_MD_OXYGEN_AUTHENTICATION','\xCE\xED\xC7\xD1\xC7\xCA \xC7\xE1\xCA\xCD\xDE\xDE \xE3\xE4 \xC7\xE1\xE5\xF5\xE6\xED\xF8\xC9');
 
-//add for styles name 
+//Add for styles name
 define('_MD_LANG_SILVER','\xDD\xD6\xF8\xED');
 define('_MD_LANG_DARK','\xC3\xD3\xE6\xCF');
 define('_MD_LANG_ORANGE','\xC8\xD1\xCA\xDE\xC7\xE1\xED');
@@ -73,4 +73,14 @@
 define('_MD_AM_AVATARS_HELP','\xE1\xE1\xCA\xCD\xDF\xE3 \xDD\xED \xC7\xE1\xD5\xE6\xD1 \xC7\xE1\xD4\xCE\xD5\xED\xC9 \xC7\xE1\xE3\xD3\xCA\xCE\xCF\xE3\xC9 \xE3\xE4 \xC7\xE1\xC3\xDA\xD6\xC7\xC1 ...');
 define('_MD_AM_TPLSETS_HELP','\xE1\xE1\xCA\xCD\xDF\xE3 \xDD\xED \xDE\xE6\xC7\xE1\xC8 \xC7\xE1\xE3\xCC\xE1\xF8\xC9 \xC3\xE6 \xC7\xE1\xC8\xD1\xC7\xE3\xCC');
 define('_MD_AM_COMMENTS_HELP','\xE1\xE1\xCA\xCD\xDF\xE3 \xDD\xED \xCA\xDA\xE1\xED\xDE\xC7\xCA \xC7\xE1\xD2\xE6\xC7\xD1 \xE6 \xC7\xE1\xC3\xDA\xD6\xC7\xC1 <br>\xC7\xE1\xE3\xD6\xC7\xDD\xC9 \xDD\xED \xC8\xD1\xE4\xC7\xE3\xCC \xC7\xE1\xC3\xCE\xC8\xC7\xD1 \xE6 \xDB\xED\xD1\xE5');
+
+//Add 10 des
+define('_MD_OXYGEN_XOOPS_LICENSE','\xCA\xD1\xCE\xED\xD5 \xE4\xD9\xC7\xE3 \xC5\xCF\xC7\xD1\xC9 \xC7\xE1\xE3\xCD\xCA\xE6\xEC');
+define('_MD_OXYGEN_KEY','\xC7\xE1\xD1\xDE\xE3 \xC7\xE1\xCA\xD3\xE1\xD3\xE1\xED');
+define('_MD_OXYGEN_LICENSE','\xC7\xE1\xCA\xD1\xCE\xED\xD5');
+define('_MD_OXYGEN_RSS','\xE3\xD3\xCA\xCC\xCF\xC7\xCA RSS');
+define('_MD_OXYGEN_POWERED_BY','\xC8\xCF\xDA\xE3 \xE3\xE4');
+define('_MD_OXYGEN_SOURCEFORGE_TEXT','\xCA\xD8\xE6\xED\xD1 \xD2\xE6\xE6\xC8\xD3 \xE3\xE4 \xCE\xE1\xC7\xE1 \xE3\xE6\xDE\xDA SourceForge');
+define('_MD_OXYGEN_ADMINISTRATION','\xC7\xE1\xC5\xCF\xC7\xD1\xC9');
+
 ?>

Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/style.css
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/style.css	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/class/gui/oxygen/language/arabic/style.css	2009-12-28 21:41:33 UTC (rev 4058)
@@ -12,8 +12,9 @@
 	font: 11px tahoma !important;
 }
 
-.confirmMsg {
+div.confirmMsg {
 	text-align: center !important;
+	direction: rtl !important;
 }
 
 #navbarCP {
@@ -38,10 +39,6 @@
 	float: right !important;
 }
 
-.confirmMsg {
-	direction: rtl !important;
-}
-
 #navOptionsCP .modname {
 	float: right !important;
 }
@@ -51,13 +48,21 @@
 }
 
 #navbarCP ul.menu ul ul {
-	right: 148px !important;
+	right: 126px !important;
 }
 
+#navbarCP ul.menu .sub {
+	background-position: left  !important;
+}
+
 #navbarCP ul.menu ul {
 	background: none !important;
 }
 
+#navbarCP ul.menu ul li {
+	padding-right: 0px !important;
+}
+
 #choosestyle a {
 	float: left !important;
 }
@@ -78,3 +83,8 @@
 .errorMsg {
 	direction: rtl !important;
 }
+
+.CPbigTitle {
+	background-position: right top !important;
+	padding-right: 40px !important;
+}

Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/banners.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/banners.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/banners.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -8,7 +8,8 @@
 define("_AM_DBUPDATED",_MD_AM_DBUPDATED);
 
 define("_AM_CURACTBNR","\xC7\xE1\xC5\xDA\xE1\xC7\xE4\xC7\xCA \xC7\xE1\xDD\xDA\xC7\xE1\xC9 \xCD\xC7\xE1\xED\xC7");
-define("_AM_BANNERID","\xC7\xE1\xD1\xDE\xE3");
+define("_AM_BANNERID","\xD1\xDE\xE3 \xC7\xE1\xC5\xDA\xE1\xC7\xE4");
+define("_AM_CLIENTID","\xD1\xDE\xE3 \xC7\xE1\xDA\xE3\xED\xE1");
 define("_AM_IMPRESION","\xC7\xE1\xCA\xC3\xCB\xED\xD1");
 define("_AM_IMPLEFT","\xE3\xCF\xC9 \xC7\xE1\xDA\xD1\xD6");
 define("_AM_CLICKS","\xE3\xD1\xC7\xCA \xC7\xE1\xD6\xDB\xD8");

Modified: XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/groups.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/groups.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/modules/system/language/arabic/admin/groups.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -35,7 +35,7 @@
 define('_AM_GROUPSMAIN', '\xC7\xE1\xD5\xDD\xCD\xC9 \xC7\xE1\xD1\xC6\xED\xD3\xED\xC9 \xE1\xE1\xE3\xCC\xE3\xE6\xDA\xC7\xCA');
 define('_AM_ADMINNO', '\xED\xCC\xC8 \xC7\xE4 \xED\xDF\xE6\xE4 \xE5\xE4\xC7\xDF \xDA\xE1\xEC \xC7\xE1\xC3\xDE\xE1 \xE3\xCF\xED\xD1 \xE6\xC7\xCD\xCF');
 // Custom block, suggested by trabis
-define("_AM_CUSTOMBLOCK","\xC8\xE1\xE6\xDF \xC5\xD6\xC7\xDD\xED");
+define('_AM_CUSTOMBLOCK','\xC8\xE1\xE6\xDF \xC5\xD6\xC7\xDD\xED');
 /**
 * New in 2.4.0
 */

Modified: XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/admin.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/admin.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/admin.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -16,13 +16,13 @@
 define( "_AM_TH_BADIPS" , '\xC7\xD1\xDE\xC7\xE3 \xC7\xE1\xC7\xED\xC8\xED \xC7\xE1\xD3\xED\xC6\xC9<br /><br /><span style="font-weight:normal;">\xC7\xDF\xCA\xC8 \xDF\xE1 \xD1\xDE\xE3 \xC7\xED\xC8\xED \xDD\xED \xD3\xD8\xD1<br />\xC7\xCA\xD1\xDF\xE5 \xDD\xC7\xD1\xDB\xC7 \xC7\xE4 \xD1\xDB\xC8\xCA \xC8\xDA\xCF\xE3 \xE3\xE4\xDA \xC7\xED \xD4\xCE\xD5</span>' ) ;
 
 define( "_AM_TH_GROUP1IPS" , '\xC7\xED\xC8\xED \xC7\xE1\xE3\xCD\xE3\xE6\xDA\xC7\xCA \xC7\xE1\xE3\xD5\xD1\xCD \xE1\xE5\xC7  \xD1\xDE\xE3 \xC7\xE1\xE3\xCC\xE3\xE6\xDA\xC9 \xE3\xCB\xE1\xC7=1<br /><br /><span style="font-weight:normal;">\xDE\xE3 \xC8\xDF\xCA\xC7\xC8\xC9 \xDF\xE1 \xC7\xED\xC8\xED \xC8\xD3\xD8\xD1<br />192.168. means 192.168.*<br />\xC7\xCA\xD1\xDF\xE5 \xDD\xC7\xD1\xDB\xC7 \xC7\xE4 \xD1\xDB\xC8\xCA  \xC8\xC7\xE1\xD3\xE3\xC7\xCD \xE1\xE1\xDF\xE1 \xC8\xC7\xE1\xCF\xCE\xE6\xE1 \xE1\xE1\xE3\xE6\xDE\xDA</span>' ) ;
+
 define('_AM_LABEL_COMPACTLOG','\xCD\xD0\xDD \xDD\xDE\xD8 \xC7\xE1\xD3\xCC\xE1 \xC7\xE1\xE3\xCA\xDF\xD1\xD1 \xE1\xE1\xC7\xED\xC8\xED \xE6\xC7\xE1\xE4\xE6\xDA');
 define('_AM_BUTTON_COMPACTLOG','\xCD\xD0\xDD \xC7\xE1\xE3\xCA\xDF\xD1\xD1');
 define('_AM_JS_COMPACTLOGCONFIRM','\xCD\xD0\xDD \xC7\xE1\xD3\xCC\xE1\xC7\xCA \xC7\xE1\xCA\xED \xCA\xCD\xCA\xE6\xED \xCA\xDF\xD1\xC7\xD1 \xC8\xE4\xDD\xD3 \xC7\xE1\xC7\xED\xC8\xED');
 define('_AM_LABEL_REMOVEALL','\xCD\xD0\xDD \xDF\xE1 \xC7\xE1\xD3\xCC\xE1\xC7\xCA');
 define('_AM_BUTTON_REMOVEALL','\xCD\xD0\xDD \xC7\xE1\xDF\xE1\xBF');
 define('_AM_JS_REMOVEALLCONFIRM','\xD3\xED\xCA\xE3 \xCD\xD0\xDD \xDF\xE1 \xC7\xE1\xD3\xCC\xE1\xC7ʿ ');
-
 define( "_AM_LABEL_REMOVE" , "\xCD\xD0\xDD \xC7\xE1\xD3\xCC\xE1\xC7\xCA \xC7\xE1\xE3\xCE\xCA\xC7\xD1\xC9:" ) ;
 define( "_AM_BUTTON_REMOVE" , "\xCD\xD0\xDD" ) ;
 define( "_AM_JS_REMOVECONFIRM" , "\xE5\xE1 \xCA\xD1\xDB\xC8 \xC8\xC7\xE1\xCD\xD0\xDD" ) ;
@@ -51,6 +51,8 @@
 define("_AM_ADV_DBPREFIX","\xE3\xE4\xDA \xC7\xE1\xCD\xDE\xE4 \xE6\xC7\xE1\xCA\xDB\xED\xED\xD1 \xDD\xED \xC7\xDA\xCF\xC7\xCF\xCA \xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA<br />\xE1\xC7\xCA\xE4\xD3\xED \xC8\xCA\xDD\xDA\xED\xE1 \xC7\xE1\xCE\xED\xC7\xD1'Force sanitizing *' \xDD\xED \xDE\xC7\xC6\xE3\xC9 \xC7\xE1\xC7\xDA\xCF\xC7\xCF\xC7\xCA \xE1\xE1\xE3\xE6\xCF\xED\xE1");
 define("_AM_ADV_LINK_TO_PREFIXMAN","\xC7\xD0\xE5\xC8 \xE1\xC7\xCF\xC7\xD1\xC9 \xCC\xCF\xE6\xE1 \xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA");
 define("_AM_ADV_MAINUNPATCHED","\xED\xCC\xC8 \xCA\xDA\xCF\xED\xE1 \xE3\xE1\xDD mainfile.php \xDF\xE3\xC7 \xCA\xE3 \xCA\xE6\xD6\xED\xCD\xC9 \xDD\xED \xE3\xE1\xDD \xC7\xDE\xD1\xC7\xE4\xED");
+define("_AM_ADV_DBFACTORYPATCHED","Your databasefactory is ready for DBLayer Trapping anti-SQL-Injection");
+define("_AM_ADV_DBFACTORYUNPATCHED","Your databasefactory is not ready for DBLayer Trapping anti-SQL-Injection. Some patches are required.");
 
 define("_AM_ADV_SUBTITLECHECK","\xCA\xDD\xCD\xD5 \xC7\xD0 \xDF\xC7\xE4 \xC7\xE1\xC8\xD1\xE4\xC7\xE3\xCC \xED\xDA\xE3\xE1");
 define("_AM_ADV_CHECKCONTAMI","\xCA\xE1\xE6\xCB ");

Modified: XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/main.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/main.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/main.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -6,5 +6,6 @@
 define('_MD_PROTECTOR_BANDWIDTHLIMITED','This site is very crowed now. try later.');
 define('_MD_PROTECTOR_TURNJAVASCRIPTON','\xDE\xE3 \xC8\xCA\xDD\xDA\xED\xE1 \xC7\xE1\xCC\xC7\xDD\xC7 \xE3\xE4 \xE3\xCA\xD5\xDD\xCD\xDF') ;
 define('_MD_PROTECTOR_DENYBYRBL','\xCA\xE3 \xD1\xDD\xD6 \xE3\xD4\xC7\xD1\xDF\xCA\xDF \xE1\xC7\xE4\xDF \xE3\xD3\xCC\xE1 \xC8\xDE\xC7\xC6\xE3\xC9 \xC7\xE1\xE3\xE3\xE4\xE6\xDA\xED\xE4 \xE3\xE4 \xC7\xE1\xC7\xD6\xC7\xDD\xC9') ;
+define('_MD_PROTECTOR_FMT_REGISTER_MORATORIUM','Post it again %s minutes later. (for Anti-SPAMMING, sorry)') ;
 
 ?>
\ No newline at end of file

Modified: XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/modinfo.php
===================================================================
--- XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/modinfo.php	2009-12-28 21:21:57 UTC (rev 4057)
+++ XoopsLanguages/arabic/core/2.4_win1256/xoops_lib/modules/protector/language/arabic/modinfo.php	2009-12-28 21:41:33 UTC (rev 4058)
@@ -101,6 +101,11 @@
 
 define($constpref.'_DISABLES','\xCA\xDA\xD8\xED\xE1 \xC8\xDA\xD6 \xC7\xE1\xE3\xD2\xC7\xED\xC7\xC1 \xE3\xE4 \xE3\xCC\xE1\xC9 \xD2\xE6\xC8\xD3 ');
 
+define($constpref.'_DBLAYERTRAP','Enable DB Layer trapping anti-SQL-Injection');
+define($constpref.'_DBLAYERTRAPDSC','Almost SQL Injection attacks will be canceled by this feature. This feature is required a support from databasefactory. You can check it on Security Advisory page. This setting must be on. Never turn it off casually.');
+define($constpref.'_DBTRAPWOSRV','Never checking _SERVER for anti-SQL-Injection');
+define($constpref.'_DBTRAPWOSRVDSC','Some servers always enable DB Layer trapping. It causes wrong detections as SQL Injection attack. If you got such errors, turn this option on. You should know this option weakens the security of DB Layer trapping anti-SQL-Injection.');
+
 define($constpref.'_BIGUMBRELLA','\xCA\xDD\xDA\xED\xE1 anti-XSS (\xC7\xE1\xE3\xD6\xE1\xC9)');
 define($constpref.'_BIGUMBRELLADSC',' \xE5\xD0\xC7 \xC7\xE1\xE4\xE6\xDA \xE3\xE4 \xC7\xE1\xE5\xCC\xE3\xC7\xCA \xED\xDE\xE6\xE3 \xC8\xD3\xD1\xDE\xC9 \xC7\xE1\xDF\xE6\xDF\xED\xD2 \xE3\xE4 \xCE\xE1\xC7\xE1 \xC7\xE6\xE3\xD1 \xCC\xC7\xDD\xC7 \xE3\xCE\xCA\xE1\xDD\xC9 \xE6\xED\xDE\xE6\xE3 \xC8\xE5\xCC\xE3\xC7\xCA  \xC7\xCE\xD1\xEC \xED\xDA\xCA\xC8\xD1 \xE3\xE4 \xC7\xCE\xD8\xD1 \xC7\xE1\xE5\xCC\xE3\xC7\xCA  \xE1\xD3\xD1\xDE\xC9 \xC8\xD1\xED\xCF \xC7\xE1\xDA\xD6\xE6 \xDA\xE1\xEC \xC7\xE1\xED\xC7\xE5\xE6 \xE6\xC7\xE1\xE5\xE6\xCA\xE3\xED\xE1 \xE6\xDB\xED\xD1\xE5\xC7');
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4057
          http://xoops.svn.sourceforge.net/xoops/?rev=4057&view=rev
Author:   trabis
Date:     2009-12-28 21:21:57 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Fixed : Cross-Site Scripting vulnerability in PM module
Fixed : SQL Injection vulnerability in kernel/notification.php

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt
    XoopsCore/trunk/htdocs/include/notification_update.php
    XoopsCore/trunk/htdocs/kernel/notification.php
    XoopsCore/trunk/htdocs/modules/pm/changelog.txt
    XoopsCore/trunk/htdocs/modules/pm/readpmsg.php

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-28 19:50:31 UTC (rev 4056)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-28 21:21:57 UTC (rev 4057)
@@ -11,6 +11,8 @@
 - Improved: Preloads are only loaded for modules installed and active, this will reduce queries and improve performance (trabis)
 - Fixed : XoopsLoad class (xoops calendar not found and other issues) (trabis)
 - Fixed : Database images not loading when using php 5.3 (trabis)
+- Fixed : Cross-Site Scripting vulnerability in PM module (trabis/secunia.com)
+- Fixed : SQL Injection vulnerability in kernel/notification.php (trabis/secunia.com)
 
 Updates from Sourceforge trackers:
 - Fixed bug #2909312 : Layout of XoopsForms is changed (trabis/ghia)
@@ -19,7 +21,7 @@
 - Fixed bug #2911944 : Users can see other users profile in edit profile (trabis/ghia)
 - Fixed bug #2910495 : BBcode code tag handles code worse than quote tag (trabis/ghia)
 - Fixed bug #2914175 : code tags translate to double tags and alter first line (trabis/ghia)
-- Fixed bug #2915970 : Banner white page on IE (trabis/gia)
+- Fixed bug #2915970 : Banner white page on IE (trabis/ghia)
 
 Added Language defines:
   language/english/banners.php _BANNERS_NO_LOGIN_DATA

Modified: XoopsCore/trunk/htdocs/include/notification_update.php
===================================================================
--- XoopsCore/trunk/htdocs/include/notification_update.php	2009-12-28 19:50:31 UTC (rev 4056)
+++ XoopsCore/trunk/htdocs/include/notification_update.php	2009-12-28 21:21:57 UTC (rev 4057)
@@ -67,7 +67,7 @@
 //  subscribed)... deal with this more gracefully?
 $notification_handler =& xoops_gethandler('notification');
 foreach ($update_list as $update_item) {
-    list($category, $item_id, $event) = split (',', $update_item['params']);
+    list($category, $item_id, $event) = preg_split('/,/', $update_item['params']);
     $status = !empty($update_item['status']) ? 1 : 0;
     if (!$status) {
         $notification_handler->unsubscribe($category, $item_id, $event, $module_id, $user_id);
@@ -86,7 +86,7 @@
 // comment submit occurs and where comment approval occurs)...
 $redirect_args = array();
 foreach ($update_list as $update_item) {
-    list($category, $item_id, $event) = split(',', $update_item['params']);
+    list($category, $item_id, $event) = preg_split('/,/', $update_item['params']);
     $category_info =& notificationCategoryInfo($category);
     if (!empty($category_info['item_name'])) {
         $redirect_args[$category_info['item_name']] = $item_id;

Modified: XoopsCore/trunk/htdocs/kernel/notification.php
===================================================================
--- XoopsCore/trunk/htdocs/kernel/notification.php	2009-12-28 19:50:31 UTC (rev 4056)
+++ XoopsCore/trunk/htdocs/kernel/notification.php	2009-12-28 21:21:57 UTC (rev 4057)
@@ -368,7 +368,7 @@
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' ' . $criteria->renderWhere();
         }
-        if (!$result = & $this->db->query($sql)) {
+        if (!$result =& $this->db->query($sql)) {
             return 0;
         }
         list ($count) = $this->db->fetchRow($result);
@@ -400,9 +400,9 @@
     {
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('not_modid', intval($module_id)));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         $criteria->add(new Criteria('not_itemid', intval($item_id)));
-        $criteria->add(new Criteria('not_event', $event));
+        $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
         $criteria->add(new Criteria('not_uid', intval($user_id)));
         $objects = $this->getObjects($criteria);
         if (count($objects) == 1) {
@@ -427,9 +427,9 @@
     {
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('not_modid', intval($module_id)));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         $criteria->add(new Criteria('not_itemid', intval($item_id)));
-        $criteria->add(new Criteria('not_event', $event));
+        $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
         $criteria->add(new Criteria('not_uid', intval($user_id)));
         return $this->getCount($criteria);
 
@@ -516,12 +516,12 @@
     function getSubscribedEvents($category, $item_id, $module_id, $user_id)
     {
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('not_modid', $module_id));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_modid', intval($module_id)));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         if ($item_id) {
-            $criteria->add(new Criteria('not_itemid', $item_id));
+            $criteria->add(new Criteria('not_itemid', intval($item_id)));
         }
-        $criteria->add(new Criteria('not_uid', $user_id));
+        $criteria->add(new Criteria('not_uid', intval($user_id)));
         $results = $this->getObjects($criteria, true);
         $ret = array();
         foreach (array_keys($results) as $i) {
@@ -627,9 +627,9 @@
         }
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('not_modid', intval($module_id)));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         $criteria->add(new Criteria('not_itemid', intval($item_id)));
-        $criteria->add(new Criteria('not_event', $event));
+        $criteria->add(new Criteria('not_event', mysql_real_escape_string($event)));
         $mode_criteria = new CriteriaCompo();
         $mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDALWAYS), 'OR');
         $mode_criteria->add(new Criteria('not_mode', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE), 'OR');
@@ -638,7 +638,7 @@
         if (!empty($user_list)) {
             $user_criteria = new CriteriaCompo();
             foreach ($user_list as $user) {
-                $user_criteria->add(new Criteria('not_uid', $user), 'OR');
+                $user_criteria->add(new Criteria('not_uid', intval($user)), 'OR');
             }
             $criteria->add($user_criteria);
         }
@@ -742,7 +742,7 @@
         }
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('not_modid', intval($module_id)));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         $criteria->add(new Criteria('not_itemid', intval($item_id)));
         $criteria->add(new Criteria('not_uid', intval($user_id)));
         if (!is_array($events)) {
@@ -750,7 +750,7 @@
         }
         $event_criteria = new CriteriaCompo();
         foreach ($events as $event) {
-            $event_criteria->add(new Criteria('not_event', $event), 'OR');
+            $event_criteria->add(new Criteria('not_event', mysql_real_escape_string($event)), 'OR');
         }
         $criteria->add($event_criteria);
         return $this->deleteAll($criteria);
@@ -784,7 +784,7 @@
     {
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('not_modid', intval($module_id)));
-        $criteria->add(new Criteria('not_category', $category));
+        $criteria->add(new Criteria('not_category', mysql_real_escape_string($category)));
         $criteria->add(new Criteria('not_itemid', intval($item_id)));
         return $this->deleteAll($criteria);
     }

Modified: XoopsCore/trunk/htdocs/modules/pm/changelog.txt
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/changelog.txt	2009-12-28 19:50:31 UTC (rev 4056)
+++ XoopsCore/trunk/htdocs/modules/pm/changelog.txt	2009-12-28 21:21:57 UTC (rev 4057)
@@ -1,3 +1,5 @@
 Version 1.03
 -------------------
-- Improved preloads for reducing queries
\ No newline at end of file
+- Improved preloads for reducing queries
+- Security fix: In the readpmsg.php file the op parameter is not sanitized before
+output (thanks to secunia.com)
\ No newline at end of file

Modified: XoopsCore/trunk/htdocs/modules/pm/readpmsg.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/readpmsg.php	2009-12-28 19:50:31 UTC (rev 4056)
+++ XoopsCore/trunk/htdocs/modules/pm/readpmsg.php	2009-12-28 21:21:57 UTC (rev 4057)
@@ -24,8 +24,8 @@
     redirect_header(XOOPS_URL, 3, _NOPERM);
     exit();
 }
-
-$_REQUEST['op'] = empty($_REQUEST['op']) ? "in" : trim(strip_tags($_REQUEST['op']));
+$valid_op_requests = array('out', 'save', 'in');
+$_REQUEST['op'] = !empty($_REQUEST['op']) && in_array($_REQUEST['op'], $valid_op_requests) ? $_REQUEST['op'] : 'in' ;
 $msg_id = empty($_REQUEST['msg_id']) ? 0 : intval($_REQUEST['msg_id']);
 $pm_handler =& xoops_getModuleHandler('message');
 if ($msg_id > 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4056
          http://xoops.svn.sourceforge.net/xoops/?rev=4056&view=rev
Author:   andrey3761
Date:     2009-12-28 19:50:31 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------


Modified Paths:
--------------
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/oxygen/language/russian/admin.php

Added Paths:
-----------
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/admin.php
    XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/index.html

Added: XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/admin.php
===================================================================
--- XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/admin.php	                        (rev 0)
+++ XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/admin.php	2009-12-28 19:50:31 UTC (rev 4056)
@@ -0,0 +1,13 @@
+<?php
+// $Id$
+// _LANGCODE: ru
+// _CHARSET : UTF-8
+// Translator: 2009-12-28 andrey3761
+
+define('_AD_SYSOPTIONS','Конфигурация системы');
+define('_AD_INSTALLEDMODULES','Установленные модули');
+
+define('_AD_XOOPSTHEMES','XOOPS темы');
+define('_AD_INTERESTSITES','Ссылки');
+
+?>
\ No newline at end of file

Added: XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/index.html
===================================================================
--- XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/index.html	                        (rev 0)
+++ XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/exm/language/russian/index.html	2009-12-28 19:50:31 UTC (rev 4056)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Modified: XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/oxygen/language/russian/admin.php
===================================================================
--- XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/oxygen/language/russian/admin.php	2009-12-28 19:05:30 UTC (rev 4055)
+++ XoopsLanguages/russian/core/2.4.2/htdocs/modules/system/class/gui/oxygen/language/russian/admin.php	2009-12-28 19:50:31 UTC (rev 4056)
@@ -59,18 +59,18 @@
 define('_MD_LANG_ORANGE','Оранжевый');
 
 // help
-define('_MD_AM_BANS_HELP','you can manage your <br> banners from here');
-define('_MD_AM_BKAD_HELP','with blocks you can <br> add many thing for <br> your users');
-define('_MD_AM_ADGS_HELP','you can add some groups <br> and manage permission <br> for ecah group');
-define('_MD_AM_IMAGES_HELP','you can add your image <br> here and make some <br> Category for yourself');
-define('_MD_AM_MDAD_HELP','at here you can install <br> and unistall your xoops <br> modules. do you know <br> what module is?');
-define('_MD_AM_PREF_HELP','xoops core and all of your <br> modules have a preferences <br> for manage module options');
-define('_MD_AM_SMLS_HELP','you and your users can use <br> this smilies in your posts ,<br> pms , comments and ...');
-define('_MD_AM_RANK_HELP','you can add ranks <br> for your users . ');
-define('_MD_AM_USER_HELP','whit this options you <br> can add new user or <br> edit old  user and userinfo ,<br> change groupss and many <br> other things');
-define('_MD_AM_FINDUSER_HELP','sometimes you need see <br>information about some users,<br> use this options for find<br> his/her');
-define('_MD_AM_MLUS_HELP','if you need send mail <br>or mp for your users ,<br> you can use this option');
-define('_MD_AM_AVATARS_HELP','add some avatars for your<br> users , they can use this <br>avatars on them profiles');
-define('_MD_AM_TPLSETS_HELP','if you need add some changes<br> in core or modules template use <br>this options');
-define('_MD_AM_COMMENTS_HELP','your users add some Comments <br>on your website , for your news , <br>photos , weblog post links and ...<br> manage user comments from here');
+define('_MD_AM_BANS_HELP','Здесь Вы можете <br /> управлять банерами.');
+define('_MD_AM_BKAD_HELP','Создание и добавление <br /> инфомационных блоков блоков <br /> для пользователей.');
+define('_MD_AM_ADGS_HELP','Вы можете добавлять <br /> и редактировать группы пользователей.');
+define('_MD_AM_IMAGES_HELP','Вы можете добалять <br /> изображения на сайт.');
+define('_MD_AM_MDAD_HELP','Установка, удаление <br /> и управление модлями');
+define('_MD_AM_PREF_HELP','У движка и модулей есть настройки. <br /> Здесь Вы сможете их настроить.');
+define('_MD_AM_SMLS_HELP','Вы и Ваши плользователи <br /> могут использовать эти смайлики...');
+define('_MD_AM_RANK_HELP','Здесь Вы сможете <br /> добавлять рангди <br /> для пользователей.');
+define('_MD_AM_USER_HELP','Здесь Вы сможете <br /> добавлять, редактировать <br /> и удалять пользователей. <br /> Назначить пользователю <br /> группы и ранг.');
+define('_MD_AM_FINDUSER_HELP','Здесь Вы сможете <br /> найти пользователей');
+define('_MD_AM_MLUS_HELP','Если Вам необходимо <br /> отправить почту или ЛС <br /> пользователям, Вы сможете <br /> это сделать сдесь.');
+define('_MD_AM_AVATARS_HELP','Добавьте аватары для <br /> пользователей. Они смогут <br /> выбрать их в профиле.');
+define('_MD_AM_TPLSETS_HELP','Если Вам необходимо сделать <br /> изменения в шаблонах, <br /> сделайте это здесь.');
+define('_MD_AM_COMMENTS_HELP','Ваши пользователи могут <br /> добавлять коментарии к новостям, <br /> вебблогам и т.д. Здесь Вы можете <br /> управлять коментариями.');
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4055
          http://xoops.svn.sourceforge.net/xoops/?rev=4055&view=rev
Author:   andrey3761
Date:     2009-12-28 19:05:30 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Fix locale.php, global.php.

Modified Paths:
--------------
    XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/global.php
    XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/locale.php

Modified: XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/global.php
===================================================================
--- XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/global.php	2009-12-28 17:42:13 UTC (rev 4054)
+++ XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/global.php	2009-12-28 19:05:30 UTC (rev 4055)
@@ -184,9 +184,9 @@
 define('_WEEK', '1 неделя');
 define('_MONTH', '1 месяц');
 
-define('_DATESTRING','j.n.Y G:i:s');
-define('_MEDIUMDATESTRING','j.n.Y G:i');
-define('_SHORTDATESTRING','j.n.Y');
+define('_DATESTRING','d.m.Y G:i:s');
+define('_MEDIUMDATESTRING','d.m.Y G:i');
+define('_SHORTDATESTRING','d.m.Y');
 /*
 The following characters are recognized in the format string:
 a - 'am' or 'pm'

Modified: XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/locale.php
===================================================================
--- XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/locale.php	2009-12-28 17:42:13 UTC (rev 4054)
+++ XoopsLanguages/russian/core/2.4.2/htdocs/language/russian/locale.php	2009-12-28 19:05:30 UTC (rev 4055)
@@ -34,8 +34,8 @@
 // insert double '\' before 't', 'r', 'n'
 define("_TODAY", "Сегодня G:i");
 define("_YESTERDAY", "Вчера G:i");
-define("_MONTHDAY", "j.n G:i");
-define("_YEARMONTHDAY", "j.n.Y G:i");
+define("_MONTHDAY", "d.m G:i");
+define("_YEARMONTHDAY", "d.m.Y G:i");
 define("_ELAPSE", "%s назад");
 define("_TIMEFORMAT_DESC", "Правильный формат: \"s\" - " . _SHORTDATESTRING . "; \"m\" - " . _MEDIUMDATESTRING . "; \"l\" - " . _DATESTRING . ";<br />" . "\"c\" или \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br />" . "specified string - Для дополнительной информации прочитайте <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">инструкцию PHP date()</a>.");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4054
          http://xoops.svn.sourceforge.net/xoops/?rev=4054&view=rev
Author:   kris_fr
Date:     2009-12-28 17:42:13 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
add index.html missing in morphogenesis trunk

Added Paths:
-----------
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/index.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/index.html

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/index.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/index.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/index.html	2009-12-28 17:42:13 UTC (rev 4054)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/index.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/index.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/index.html	2009-12-28 17:42:13 UTC (rev 4054)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4053
          http://xoops.svn.sourceforge.net/xoops/?rev=4053&view=rev
Author:   kris_fr
Date:     2009-12-27 15:06:17 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
update theme template Mor.Pho.GEN.e.sis 3.1 beta 1

Modified Paths:
--------------
    XoopsThemes/PublicInterface/morphogenesis/trunk/changelog.txt
    XoopsThemes/PublicInterface/morphogenesis/trunk/css/blocks.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/css/layout-soup.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/english/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/french/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/german/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/italian/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/persian/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/portuguesebr/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/language/romanian/main.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_breadcrumbs.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userform.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/style.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/theme.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/theme.ini
    XoopsThemes/PublicInterface/morphogenesis/trunk/xo-info.php
    XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_homepage.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_metas.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_thm_parameters.html

Added Paths:
-----------
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/style.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_canvas.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_thm_parameters.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html.old
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_canvas.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_homepage.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_thm_parameters.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_canvas.html
    XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_page.html

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/changelog.txt
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/changelog.txt	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/changelog.txt	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,22 @@
-Mor.Pho.GEN.e.sis Theme - Changelog
+Mor.Pho.GEN.e.sis Theme Framework - Changelog
 
 ============================
-Version 3.0.1 ( for xoops 2.x.x )
+Version 3.1 beta 1 ( for xoops 2.4.x )
 ============================
-- Change Block Id Css ( kris/trabis )
\ No newline at end of file
+- Add an extra SMARTY variable $xoops_themeurl - (kris / kaifulee team)
+- Add an extra SMARTY variable $xoops_module_theme - (kris / kaifulee team)
+- If a module has its own css (located themes/themename/modules/dirname/style.css), append it to $xoops_module_header - (kris / kaifulee team)
+- If a module defines its own canvas template (located themes/themename/modules/dirname/xo_canvas.html), take it; otherwise the default canvas (themes/themename/xotpl/xo_canvas.html) is used - (kris / kaifulee team)
+- Add new include file xo_page.html for xoops basics columns (kris)
+- Add personalization exemple for contact module and display userinfo (kris)
+- Search engine optimization - see http://www.xoops.org/modules/smartfaq/faq.php?faqid=362 (kris)
+
+============================
+Version 3.0.2 ( for xoops 2.4.x )
+============================
+- Add css resize width for left and right columns (+ blocks) - (kris)
+
+============================
+Version 3.0.1 ( for xoops 2.4.x )
+============================
+- Change Block Id Css - (kris / trabis)
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/css/blocks.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/css/blocks.css	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/css/blocks.css	2009-12-27 15:06:17 UTC (rev 4053)
@@ -94,6 +94,9 @@
 /*===== left column =======*/
 #xo-canvas-leftcolumn { padding: .8em .5em .5em .5em;}
 #xo-canvas-leftcolumn .xo-block {
+	/*max-width:					95%;
+	resize:						horizontal;
+	overflow:					hidden;*/
 	margin-right:				.25em;
 	margin-bottom:				1.2em;
 }
@@ -128,7 +131,13 @@
 	border-style:				solid;
 	border-color:				#ddd;
 }
-#xo-canvas-rightcolumn .xo-block {margin-bottom: 1.2em; margin-left:.25em;}
+#xo-canvas-rightcolumn .xo-block {
+	/*max-width:					95%;
+	resize:						horizontal;
+	overflow:					auto;*/
+	margin-bottom: 				1.2em;
+	margin-left:				.25em;
+}
 #xo-canvas-rightcolumn a {	text-decoration: none;}
 #xo-canvas-rightcolumn a:hover { text-decoration: underline;}
 #xo-canvas-rightcolumn .xo-blocktitle {

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/css/layout-soup.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/css/layout-soup.css	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/css/layout-soup.css	2009-12-27 15:06:17 UTC (rev 4053)
@@ -18,13 +18,23 @@
 
 /*============= Canvas rules ============*/
 #xo-canvas-columns {	width: 100%; border-collapse: collapse;}
-#xo-canvas-leftcolumn { width: 180px;}
+#xo-canvas-leftcolumn {
+	width: 					180px;
+	/*max-width:				300px;
+	resize:					horizontal;
+	overflow:				auto;*/
+}
 
 /* Page [center column] rules */
 #xo-page { min-height: 400px; padding-top: 10px;}
 * html #xo-page {	height: 400px;}
 
-#xo-canvas-rightcolumn {width: 180px;}
+#xo-canvas-rightcolumn {
+	width: 					180px;
+	/*max-width:				300px;
+	resize:					horizontal;
+	overflow:				auto;*/
+}
 #xo-canvas-leftcolumn, #xo-page, #xo-canvas-rightcolumn { vertical-align: top;}
 
 /*========== Canvas rules (when columns are visible) ===========*/

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/english/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/english/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/english/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.0");
+define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.1");
 define("THEME_DESC",					"birth of evolution");
 define("THEME_DESIGNER",				"Design by : <a rel='external' rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratory'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='XOOPS Project French Community'>XOOPS French Community</a>");
 define("THEME_UPTOP",					"Back to Top");

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/french/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/french/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/french/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // g&eacute;n&eacute;ralit&eacute;s
-define("THEME_NAME",					"Mor&#42;Pho&#42;GEN&#42;e&#42;sis 3.0");
+define("THEME_NAME",					"Mor&#42;Pho&#42;GEN&#42;e&#42;sis 3.1");
 define("THEME_DESC",					"birth of evolution");
 define("THEME_DESIGNER",				"Design par : <a rel='external' href='http://labs.xoofoo.org/' title='Le laboratoire XooFoo.org de Kris'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='Communaut&eacute; Francophone du Projet XOOPS'>Communaut&#233; Francophone XOOPS</a>");
 define("THEME_UPTOP",					"Haut de Page");

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/german/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/german/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/german/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.0");
+define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.1");
 define("THEME_DESC",					"birth of evolution");
 define("THEME_DESIGNER",				"Design by : <a rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratory'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='XOOPS Project French Community'>XOOPS French Community</a>");
 define("THEME_UPTOP",					"Zur\xFCck nach Oben");

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/italian/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/italian/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/italian/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.0");
+define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.1");
 define("THEME_DESC",					"nascita di sviluppo");
 define("THEME_DESIGNER",				"Disegno da : <a rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratory'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='XOOPS Project French Community'>XOOPS French Community</a>");
 define("THEME_UPTOP",					"Parte Superiore");

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/persian/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/persian/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/persian/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME",					"MorPhoGENesis 3.0");
+define("THEME_NAME",					"MorPhoGENesis 3.1");
 define("THEME_DESC",					"birth of evolution");
 define("THEME_DESIGNER",				"طراحی : <a rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratory'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='XOOPS Project French Community'>زوپس فرانسه</a>");
 define("THEME_UPTOP",					"بالا صفحه");

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/portuguesebr/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/portuguesebr/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/portuguesebr/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME", "Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.0"); //ok
+define("THEME_NAME", "Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.1"); //ok
 define("THEME_DESC", "Nascimento da Evolu\xE7\xE3o"); // ok
 define("THEME_DESIGNER","Design by : <a rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratorio'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='Comunidade Francesa do Projeto XOOPS'>Comunidade XOOPS Fran\xE7a</a>");
 define("THEME_UPTOP", "Voltar ao in\xEDcio"); //ok

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/language/romanian/main.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/language/romanian/main.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/language/romanian/main.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <?php
 // generality
-define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.0");
+define("THEME_NAME",					"Mor\xB7Pho\xB7GEN\xB7e\xB7sis 3.1");
 define("THEME_DESC",					"nasterea evolutiei");
 define("THEME_DESIGNER",				"Design de : <a rel='external' href='http://labs.xoofoo.org/' title='Kris XooFoo Laboratory'>XooFoo</a> - <a rel='external' href='http://www.afux.org/' title='Comunitatea Francofona XOOPS'>Comunitatea Francofona XOOPS</a>");
 define("THEME_UPTOP",					"Inapoi Sus");

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/style.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/style.css	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/style.css	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,17 @@
+/*
+ * Mor.pho.GEN.e.sis 3.0
+ * Thanks to Snow77, Skalpa and Leostotch for the initial work, Dugris and Burning for help and test
+ *
+ * @copyright       Kris <http://labs.xoofoo.org/>
+ * @license         CREATIVE COMMONS Attribution-ShareAlike 3.0
+ * @package         themes
+ * @since           2.4.x
+ * @author          Kris <http://labs.xoofoo.org/>
+ * @maintained      Afux <http://www.afux.org>
+ *
+ * @version         $Id
+*/
+
+/*============== Override Style for contact module =================*/
+#xo-canvas-content {margin: 2em auto; width:800px;}
+#xo-uptop {width:50%;}
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_canvas.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_canvas.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_canvas.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,69 @@
+	<!-- Theme others parameters -->
+	<{includeq file="$xoops_module_theme/xo_thm_parameters.html"}>
+<!-- Metas, Titles, and Style Sheets -->
+	<{includeq file="$theme_name/xo_metas.html"}>
+<!-- Additionals Scripts -->
+	<{includeq file="$theme_name/xo_scripts.html"}>
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<{if $xoBlocks.canvas_left and $xoBlocks.canvas_right}><{assign var=columns_layout value='threecolumns-layout'}>
+<{elseif $xoBlocks.canvas_left}><{assign var=columns_layout value='leftcolumn-layout'}>
+<{elseif $xoBlocks.canvas_right}><{assign var=columns_layout value='rightcolumn-layout'}>
+<{/if}>
+<div id="xo-wrapper" class="<{$xoops_dirname}>">
+	<div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
+	<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
+
+		<!-- HEADER -->
+		<div id="xo-header" class="<{$xoops_dirname}>">
+
+			<!-- INCLUDE TOPHEADER -->
+			<{if $theme_view_topheader}><{includeq file="$theme_name/xo_topheader.html"}><{/if}>
+
+			<!-- INCLUDE HEADER WITH LOGO AND BANNER -->
+			<!-- checking whether the display of the banner is enabled or not in the site administration -->
+			<{if $xoops_banner and $xoops_banner != '&nbsp;'}>
+				<!-- INCLUDE WITH BANNER ACTIVED-->
+				<{includeq file="$theme_name/xo_banner_commercial.html"}>
+			<{else}>
+				<!-- INCLUDE WITH BANNER DESACTIVED -->
+				<{includeq file="$theme_name/xo_banner.html"}>
+			<{/if}>
+			<!-- INCLUDE HORIZONTAL MENU -->
+			<{if $theme_view_globalnav}><{includeq file="$theme_name/xo_globalnav.html"}><{/if}>
+		</div>
+		<!-- END HEADER -->
+		
+		<!-- INCLUDE HOMEPAGE FOR ANONYMOUS AND ONLY MAINPAGE (see comments in file xo_homepage.html -->
+		<{if $theme_view_homepage}><{includeq file="$theme_name/xo_homepage.html"}><{/if}>	
+		
+      <!-- CONTENT AREA -->
+		<!-- Do not change the part below is supposed to be the standard architecture that everyone should use -->
+		<div id="xo-canvas-content" class="<{$xoops_dirname}>">
+			<!--<{if $xoBlocks.canvas_top}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_top
+					zoneClass='' zoneId='xo-canvas-header'
+					}>
+			<{/if}>-->
+			
+			<{includeq file="$theme_name/xo_page.html"}>
+
+			<!--<{if $xoBlocks.canvas_bottom}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_bottom
+					zoneClass='' zoneId='xo-canvas-footer'
+					}>
+			<{/if}>-->
+			
+			<!-- INCLUDE BOTTOM PAGE" -->
+			<{includeq file="$theme_name/xo_bottompage.html"}>
+
+		</div>
+		<!-- INCLUDE FOOTER -->
+		<{includeq file="$theme_name/xo_footer.html"}>
+	</div>
+		<!--{xo-logger-output}-->
+</div>
+	<!-- INCLUDE BARADMIN - xo_footerstatic.html -->
+	<{if $xoops_isadmin && $theme_view_baradmin}><{includeq file="$theme_name/xo_footerstatic.html"}><{/if}>
+</body>
+</html>
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_thm_parameters.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_thm_parameters.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/contact/xo_thm_parameters.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,47 @@
+<!-- parameters for the positioning of blocks top and bottom -->
+	<{* Center blocks display order valid values are:  lrc (left right / center) lcr (left center right) clr (center / left right)	*}>
+	<{assign var=theme_top_order value=lrc}>
+	<{assign var=theme_bottom_order value=lrc}>
+	
+<!-- Setting this to 0 will remove the display toggle button on all browsers -->
+	<{assign var=theme_left_toggle value=0}>
+	<{assign var=theme_right_toggle value=0}>
+	<{assign var=theme_homepage_toggle value=1}>
+
+<!-- Setting this to 0 will remove the display link for view all on all browsers -->	
+	<{assign var=theme_viewall_block value=1}>
+	<{assign var=theme_viewall_content value=1}>
+	
+<!-- Setting this to 0 will remove the display the topheader -->	
+	<{assign var=theme_view_topheader value=1}>
+	<!-- for remove the display the language choice in topheader-->	
+	<{assign var=theme_view_languagechoice value=1}>	
+	<!-- for remove the display the searchbar in topheader-->	
+	<{assign var=theme_view_searchbar value=1}>
+	<!-- for remove the display the userbar in topheader -->	
+	<{assign var=theme_view_userbar value=1}>
+	<!-- for remove the display the userbar in topheader -->	
+	<{assign var=theme_view_accessibilitybar value=1}>
+<!-- Setting this to 0 will remove the display the horizontal menu globalnav -->	
+	<{assign var=theme_view_globalnav value=1}>
+<!-- Setting this to 0 will remove the display the homepage/homebox -->	
+	<{assign var=theme_view_homepage value=1}>
+<!-- Setting this to 0 will remove the display the left column -->	
+	<{assign var=theme_view_leftcolumn value=0}>
+<!-- Setting this to 0 will remove the display the right column -->	
+	<{assign var=theme_view_rightcolumn value=0}>
+<!-- Setting this to 0 will remove the display the topblock content -->	
+	<{assign var=theme_view_topblock value=1}>
+<!-- Setting this to 0 will remove the display the bottomblock content -->	
+	<{assign var=theme_view_bottomblock value=1}>
+<!-- Setting this to 0 will remove the display the breadcrumb -->	
+	<{assign var=theme_view_breadcrumb value=1}>
+<!-- Setting this to 0 will remove the display the socialbookmark bar -->	
+	<{assign var=theme_view_socialbookmark value=0}>
+<!-- Setting this to 0 will remove the display the blockfooter in footer -->	
+	<{assign var=theme_view_blockfooter value=0}>
+<!-- Setting this to 0 will remove the display the w3cblock in footer -->	
+	<{assign var=theme_view_w3cblockfooter value=1}>
+<!-- Setting this to 0 will remove the display the baradmin -->	
+	<{assign var=theme_view_baradmin value=1}>
+	
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_breadcrumbs.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_breadcrumbs.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_breadcrumbs.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,5 +1,3 @@
-<{$xoTheme->addStylesheet('modules/profile/style.css')}>
-
 <div class="breadcrumbs">
     <{foreach item=itm from=$xoBreadcrumbs name=bcloop}>
         <strong>

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userform.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userform.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userform.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,5 +1,3 @@
-<{$xoTheme->addStylesheet('modules/profile/style.css')}>
-
 <div id="xo-profile-userform">
 	<div class="center"><h4><{$smarty.const.THEME_BROWSERCHECK}></h4></div>
 	<fieldset>

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,64 +1,5 @@
 <{includeq file="db:profile_breadcrumbs.html"}>
 
-<div class="center">
-    <{if $avatar}>
-        <img class="comUserImg" src="<{$avatar}>" alt="<{$uname}>" />
-		<br />
-    <{/if}>
-        <strong><{$uname}></strong>
-		<br />
-        <{if $email}>
-             <img class="xo-icons" src="<{xoImgUrl icons/users/email.png}>" alt=""/><{$email}>
-        <{/if}>
-        <{if !$user_ownpage && $xoops_isuser == true}>
-        <form name="usernav" action="user.php" method="post">
-            <input type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>"  />
-        </form>
-        <{/if}>        
-    </div>
-</div>
-<br style="clear: both;" />
-
-<{if $user_ownpage == true}>
-<div class="center">
-    <form name="usernav" action="user.php" method="post">
-        <input type="button" value="<{$lang_editprofile}>"  />
-        <input type="button" value="<{$lang_changepassword}>"  />
-        <{if $user_changeemail}>
-            <input type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>"  />
-        <{/if}>
-
-        <{if $user_candelete == true}>
-            <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php">
-                <input type="hidden" name="op" value="delete">
-                <input type="hidden" name="uid" value="<{$user_uid}>">
-                <input type="button" value="<{$lang_deleteaccount}>"  />
-            </form>
-        <{/if}>
-
-        <input type="button" value="<{$lang_avatar}>"  />
-        <input type="button" value="<{$lang_inbox}>"  />
-        <input type="button" value="<{$lang_logout}>"  />
-    </form>
-</div>
-<{elseif $xoops_isadmin != false}>
-<div style="float: left; padding: 5px;">
-        <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/deactivate.php">
-        <input type="button" value="<{$lang_editprofile}>"  />
-        <input type="hidden" name="uid" value="<{$user_uid}>" />
-        <{if $userlevel == 1}>
-            <input type="hidden" name="level" value="0" />
-            <input type="button" value="<{$smarty.const._PROFILE_MA_DEACTIVATE}>"  />
-        <{else}>
-            <input type="hidden" name="level" value="1" />
-            <input type="button" value="<{$smarty.const._PROFILE_MA_ACTIVATE}>"  />
-        <{/if}>
-        </form>
-</div>
-<{/if}>
-
-<br style="clear: both;" />
-
 <{foreach item=category from=$categories}>
     <{if isset($category.fields)}>
         <div class="profile-list-category" id="profile-category-<{$category.cat_id}>">

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html.old
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html.old	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/profile_userinfo.html.old	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,102 @@
+<{includeq file="db:profile_breadcrumbs.html"}>
+
+<div class="center">
+    <{if $avatar}>
+        <img class="comUserImg" src="<{$avatar}>" alt="<{$uname}>" />
+		<br />
+    <{/if}>
+        <strong><{$uname}></strong>
+		<br />
+        <{if $email}>
+             <img class="xo-icons" src="<{xoImgUrl icons/users/email.png}>" alt=""/><{$email}>
+        <{/if}>
+        <{if !$user_ownpage && $xoops_isuser == true}>
+        <form name="usernav" action="user.php" method="post">
+            <input type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>"  />
+        </form>
+        <{/if}>        
+    </div>
+</div>
+<br style="clear: both;" />
+
+<{if $user_ownpage == true}>
+<div class="center">
+    <form name="usernav" action="user.php" method="post">
+        <input type="button" value="<{$lang_editprofile}>"  />
+        <input type="button" value="<{$lang_changepassword}>"  />
+        <{if $user_changeemail}>
+            <input type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>"  />
+        <{/if}>
+
+        <{if $user_candelete == true}>
+            <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php">
+                <input type="hidden" name="op" value="delete">
+                <input type="hidden" name="uid" value="<{$user_uid}>">
+                <input type="button" value="<{$lang_deleteaccount}>"  />
+            </form>
+        <{/if}>
+
+        <input type="button" value="<{$lang_avatar}>"  />
+        <input type="button" value="<{$lang_inbox}>"  />
+        <input type="button" value="<{$lang_logout}>"  />
+    </form>
+</div>
+<{elseif $xoops_isadmin != false}>
+<div style="float: left; padding: 5px;">
+        <form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/deactivate.php">
+        <input type="button" value="<{$lang_editprofile}>"  />
+        <input type="hidden" name="uid" value="<{$user_uid}>" />
+        <{if $userlevel == 1}>
+            <input type="hidden" name="level" value="0" />
+            <input type="button" value="<{$smarty.const._PROFILE_MA_DEACTIVATE}>"  />
+        <{else}>
+            <input type="hidden" name="level" value="1" />
+            <input type="button" value="<{$smarty.const._PROFILE_MA_ACTIVATE}>"  />
+        <{/if}>
+        </form>
+</div>
+<{/if}>
+
+<br style="clear: both;" />
+
+<{foreach item=category from=$categories}>
+    <{if isset($category.fields)}>
+        <div class="profile-list-category" id="profile-category-<{$category.cat_id}>">
+            <table class="outer" cellpadding="4" cellspacing="1">
+                <tr>
+                  <th colspan="2" align="center"><{$category.cat_title}></th>
+                </tr>
+                <{foreach item=field from=$category.fields}>
+                    <tr>
+                        <td class="head"><{$field.title}></td>
+                        <td class="even"><{$field.value}></td>
+                    </tr>
+                <{/foreach}>
+            </table>
+        </div>
+    <{/if}>
+<{/foreach}>
+
+<{if $modules}>
+<br style="clear: both;" />
+<div class="profile-list-activity">
+    <h3><{$recent_activity}></h3>
+    <!-- start module search results loop -->
+    <{foreach item=module from=$modules}>
+
+    <h4><{$module.name}></h4>
+
+      <!-- start results item loop -->
+          <{foreach item=result from=$module.results}>
+
+          <p><img class="xo-icons" src="<{$result.image}>" alt="<{$module.name}>" />&nbsp;<strong><a href="<{$result.link}>"><{$result.title}></a></strong> - <span class="small italic">(<{$result.time}>)</span></p>
+
+          <{/foreach}>
+          <!-- end results item loop -->
+
+    <{$module.showall_link}>
+
+    <{/foreach}>
+    <!-- end module search results loop -->
+</div>    
+<{/if}>
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/style.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/style.css	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/style.css	2009-12-27 15:06:17 UTC (rev 4053)
@@ -15,4 +15,6 @@
 /*============== Styles for profile_userform.html =================*/
 #xo-profil-userform label[name=xolb_agree_disc] {display:block; max-width: 400px !important;} /* specifix fix for profile module */
 #xo-profile-userform  input[type=submit]{margin-left: 200px;}
-#xo-profile-userform p {margin-bottom: 1em; margin-left:180px;}
\ No newline at end of file
+#xo-profile-userform p {margin-bottom: 1em; margin-left:180px;}
+
+#xo-homepage {	height:	220px;}
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_canvas.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_canvas.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_canvas.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,69 @@
+	<!-- Theme others parameters -->
+	<{includeq file="$xoops_module_theme/xo_thm_parameters.html"}>
+<!-- Metas, Titles, and Style Sheets -->
+	<{includeq file="$theme_name/xo_metas.html"}>
+<!-- Additionals Scripts -->
+	<{includeq file="$theme_name/xo_scripts.html"}>
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<{if $xoBlocks.canvas_left and $xoBlocks.canvas_right}><{assign var=columns_layout value='threecolumns-layout'}>
+<{elseif $xoBlocks.canvas_left}><{assign var=columns_layout value='leftcolumn-layout'}>
+<{elseif $xoBlocks.canvas_right}><{assign var=columns_layout value='rightcolumn-layout'}>
+<{/if}>
+<div id="xo-wrapper" class="<{$xoops_dirname}>">
+	<div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
+	<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
+
+		<!-- HEADER -->
+		<div id="xo-header" class="<{$xoops_dirname}>">
+
+			<!-- INCLUDE TOPHEADER -->
+			<{if $theme_view_topheader}><{includeq file="$theme_name/xo_topheader.html"}><{/if}>
+
+			<!-- INCLUDE HEADER WITH LOGO AND BANNER -->
+			<!-- checking whether the display of the banner is enabled or not in the site administration -->
+			<{if $xoops_banner and $xoops_banner != '&nbsp;'}>
+				<!-- INCLUDE WITH BANNER ACTIVED-->
+				<{includeq file="$theme_name/xo_banner_commercial.html"}>
+			<{else}>
+				<!-- INCLUDE WITH BANNER DESACTIVED -->
+				<{includeq file="$theme_name/xo_banner.html"}>
+			<{/if}>
+			<!-- INCLUDE HORIZONTAL MENU -->
+			<{if $theme_view_globalnav}><{includeq file="$theme_name/xo_globalnav.html"}><{/if}>
+		</div>
+		<!-- END HEADER -->
+		
+		<!-- INCLUDE HOMEPAGE FOR ANONYMOUS AND ONLY MAINPAGE (see comments in file xo_homepage.html -->
+		<{if $theme_view_homepage}><{includeq file="$xoops_module_theme/xo_homepage.html"}><{/if}>	
+		
+      <!-- CONTENT AREA -->
+		<!-- Do not change the part below is supposed to be the standard architecture that everyone should use -->
+		<div id="xo-canvas-content" class="<{$xoops_dirname}>">
+			<!--<{if $xoBlocks.canvas_top}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_top
+					zoneClass='' zoneId='xo-canvas-header'
+					}>
+			<{/if}>-->
+			
+			<{includeq file="$theme_name/xo_page.html"}>
+
+			<!--<{if $xoBlocks.canvas_bottom}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_bottom
+					zoneClass='' zoneId='xo-canvas-footer'
+					}>
+			<{/if}>-->
+			
+			<!-- INCLUDE BOTTOM PAGE" -->
+			<{includeq file="$theme_name/xo_bottompage.html"}>
+
+		</div>
+		<!-- INCLUDE FOOTER -->
+		<{includeq file="$theme_name/xo_footer.html"}>
+	</div>
+		<!--{xo-logger-output}-->
+</div>
+	<!-- INCLUDE BARADMIN - xo_footerstatic.html -->
+	<{if $xoops_isadmin && $theme_view_baradmin}><{includeq file="$theme_name/xo_footerstatic.html"}><{/if}>
+</body>
+</html>
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_homepage.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_homepage.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_homepage.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,73 @@
+<{if $smarty.server.PHP_SELF=='/modules/profile/userinfo.php'}>
+<!-- In the above line: if your site is at the root of the server, put '/index.php', otherwise '/foldername/index.php'
+If you have difficulty finding the path, add <{$smarty.server.PHP_SELF}> in first line of this file and the information displayed, then remove the line and this comments for safety issues  <{$xoops_rootpath}>
+Dans la ligne ci-dessus : si votre site est \xE0 la racine du serveur, mettez '/index.php', sinon '/nomdudossier/index.php'
+Si vous avez des difficult\xE9s \xE0 trouver le chemin,ins\xE9rer <{$smarty.server.PHP_SELF}> en premi\xE8re ligne de ce fichier et les informations s'afficheront, puis retirer la ligne et ce commentaire pour des questions de s\xE9curit\xE9 -->
+
+	<{if $theme_homepage_toggle}>
+		<div id="xo-showhidehomepage"  title="<{$smarty.const.THEME_SHOWHIDE_HOMEPAGE}>">
+			<{$smarty.const.THEME_SHOWHIDE_HOMEPAGE}>
+		</div>
+	<{/if}>
+
+	<div id="xo-homepage">
+		<div class="center">
+			<br />
+			<{if $avatar}>
+				<img class="comUserImg" src="<{$avatar}>" alt="<{$uname}>" />
+				<br />
+			<{/if}>
+				<strong><{$uname}></strong>
+				<br />
+			<{if $email}>
+				 <img class="xo-icons" src="<{xoImgUrl icons/users/email.png}>" alt=""/><{$email}>
+			<{/if}>
+			<{if !$user_ownpage && $xoops_isuser == true}>
+			<form name="usernav" action="user.php" method="post">
+				<input type="button" value="<{$smarty.const._PROFILE_MA_SENDPM}>"  />
+			</form>
+			<{/if}>        
+		</div>
+		
+		<br style="clear: both;" />
+		
+		<{if $user_ownpage == true}>
+			<div class="center">
+				<form name="usernav" action="user.php" method="post">
+					<input type="button" value="<{$lang_editprofile}>"  />
+					<input type="button" value="<{$lang_changepassword}>"  />
+					<{if $user_changeemail}>
+						<input type="button" value="<{$smarty.const._PROFILE_MA_CHANGEMAIL}>"  />
+					<{/if}>
+
+					<{if $user_candelete == true}>
+						<form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/user.php">
+							<input type="hidden" name="op" value="delete">
+							<input type="hidden" name="uid" value="<{$user_uid}>">
+							<input type="button" value="<{$lang_deleteaccount}>"  />
+						</form>
+					<{/if}>
+
+					<input type="button" value="<{$lang_avatar}>"  />
+					<input type="button" value="<{$lang_inbox}>"  />
+					<input type="button" value="<{$lang_logout}>"  />
+				</form>
+			</div>
+		<{elseif $xoops_isadmin != false}>
+			<div class="center">
+					<form method="post" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/deactivate.php">
+					<input type="button" value="<{$lang_editprofile}>"  />
+					<input type="hidden" name="uid" value="<{$user_uid}>" />
+					<{if $userlevel == 1}>
+						<input type="hidden" name="level" value="0" />
+						<input type="button" value="<{$smarty.const._PROFILE_MA_DEACTIVATE}>"  />
+					<{else}>
+						<input type="hidden" name="level" value="1" />
+						<input type="button" value="<{$smarty.const._PROFILE_MA_ACTIVATE}>"  />
+					<{/if}>
+					</form>
+			</div>
+		<{/if}>
+		
+	</div>
+<{/if}>
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_thm_parameters.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_thm_parameters.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/modules/profile/xo_thm_parameters.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,47 @@
+<!-- parameters for the positioning of blocks top and bottom -->
+	<{* Center blocks display order valid values are:  lrc (left right / center) lcr (left center right) clr (center / left right)	*}>
+	<{assign var=theme_top_order value=lrc}>
+	<{assign var=theme_bottom_order value=lrc}>
+	
+<!-- Setting this to 0 will remove the display toggle button on all browsers -->
+	<{assign var=theme_left_toggle value=0}>
+	<{assign var=theme_right_toggle value=0}>
+	<{assign var=theme_homepage_toggle value=1}>
+
+<!-- Setting this to 0 will remove the display link for view all on all browsers -->	
+	<{assign var=theme_viewall_block value=1}>
+	<{assign var=theme_viewall_content value=1}>
+	
+<!-- Setting this to 0 will remove the display the topheader -->	
+	<{assign var=theme_view_topheader value=1}>
+	<!-- for remove the display the language choice in topheader-->	
+	<{assign var=theme_view_languagechoice value=0}>	
+	<!-- for remove the display the searchbar in topheader-->	
+	<{assign var=theme_view_searchbar value=0}>
+	<!-- for remove the display the userbar in topheader -->	
+	<{assign var=theme_view_userbar value=1}>
+	<!-- for remove the display the userbar in topheader -->	
+	<{assign var=theme_view_accessibilitybar value=1}>
+<!-- Setting this to 0 will remove the display the horizontal menu globalnav -->	
+	<{assign var=theme_view_globalnav value=1}>
+<!-- Setting this to 0 will remove the display the homepage/homebox -->	
+	<{assign var=theme_view_homepage value=1}>
+<!-- Setting this to 0 will remove the display the left column -->	
+	<{assign var=theme_view_leftcolumn value=0}>
+<!-- Setting this to 0 will remove the display the right column -->	
+	<{assign var=theme_view_rightcolumn value=0}>
+<!-- Setting this to 0 will remove the display the topblock content -->	
+	<{assign var=theme_view_topblock value=1}>
+<!-- Setting this to 0 will remove the display the bottomblock content -->	
+	<{assign var=theme_view_bottomblock value=1}>
+<!-- Setting this to 0 will remove the display the breadcrumb -->	
+	<{assign var=theme_view_breadcrumb value=1}>
+<!-- Setting this to 0 will remove the display the socialbookmark bar -->	
+	<{assign var=theme_view_socialbookmark value=0}>
+<!-- Setting this to 0 will remove the display the blockfooter in footer -->	
+	<{assign var=theme_view_blockfooter value=1}>
+<!-- Setting this to 0 will remove the display the w3cblock in footer -->	
+	<{assign var=theme_view_w3cblockfooter value=1}>
+<!-- Setting this to 0 will remove the display the baradmin -->	
+	<{assign var=theme_view_baradmin value=1}>
+	
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/theme.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/theme.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/theme.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -5,114 +5,28 @@
 	<{assign var=theme_name value=$xoTheme->folderName}>
 <!-- Directory html blocks files or additional html files by include -->
 	<{assign var=theme_name value=$xoTheme->folderName|cat:'/xotpl'}>
-<!-- Directory html plugins files -->	
+<!-- Directory html plugins files -->
 	<{assign var=theme_plugin value=$xoTheme->folderName|cat:'/xoplugins'}>
-<!-- Directory html javascript files -->	
+<!-- Directory html javascript files -->
 	<{assign var=theme_js value=$xoTheme->folderName|cat:'/js'}>
-<!-- Theme others parameters -->
-	<{includeq file="$theme_name/xo_thm_parameters.html"}>
-<!-- Metas, Titles, and Style Sheets -->
-	<{includeq file="$theme_name/xo_metas.html"}>
-<!-- Additionals Scripts -->
-	<{includeq file="$theme_name/xo_scripts.html"}>
-</head>
-<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
-<{if $xoBlocks.canvas_left and $xoBlocks.canvas_right}><{assign var=columns_layout value='threecolumns-layout'}>
-<{elseif $xoBlocks.canvas_left}><{assign var=columns_layout value='leftcolumn-layout'}>
-<{elseif $xoBlocks.canvas_right}><{assign var=columns_layout value='rightcolumn-layout'}>
-<{/if}>
-<div id="xo-wrapper" class="<{$xoops_dirname}>">
-	<div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
-	<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
 
-		<!-- HEADER -->
-		<div id="xo-header" class="<{$xoops_dirname}>">
-
-			<!-- INCLUDE TOPHEADER -->
-			<{if $theme_view_topheader}><{includeq file="$theme_name/xo_topheader.html"}><{/if}>
-
-			<!-- INCLUDE HEADER WITH LOGO AND BANNER -->
-			<!-- checking whether the display of the banner is enabled or not in the site administration -->
-			<{if $xoops_banner and $xoops_banner != '&nbsp;'}>
-				<!-- INCLUDE WITH BANNER ACTIVED-->
-				<{includeq file="$theme_name/xo_banner_commercial.html"}>
-			<{else}>
-				<!-- INCLUDE WITH BANNER DESACTIVED -->
-				<{includeq file="$theme_name/xo_banner.html"}>
-			<{/if}>
-			<!-- INCLUDE HORIZONTAL MENU -->
-			<{if $theme_view_globalnav}><{includeq file="$theme_name/xo_globalnav.html"}><{/if}>
-		</div>
-		<!-- END HEADER -->
-		
-		<!-- INCLUDE HOMEPAGE FOR ANONYMOUS AND ONLY MAINPAGE (see comments in file xo_homepage.html -->
-		<{if $theme_view_homepage}><{includeq file="$theme_name/xo_homepage.html"}><{/if}>	
-		
-      <!-- CONTENT AREA -->
-		<!-- Do not change the part below is supposed to be the standard architecture that everyone should use -->
-		<div id="xo-canvas-content" class="<{$xoops_dirname}>">
-			<!--<{if $xoBlocks.canvas_top}>
-				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_top
-					zoneClass='' zoneId='xo-canvas-header'
-					}>
-			<{/if}>-->
-			<table id="xo-canvas-columns">
-			<tr>
-				<{if $xoBlocks.canvas_left && $theme_view_leftcolumn}>
-					<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_left
-						zoneClass='xo-canvas-column' zoneId='xo-canvas-leftcolumn' zoneTag='td'
-						}>
-				<{/if}>
-
-				<td id="xo-page">
-					<{if $theme_view_breadcrumb}><{includeq file="$theme_name/xo_breadcrumb.html"}><{/if}>
-
-					<{if $theme_view_topblock && ($xoBlocks.page_topleft or $xoBlocks.page_topcenter or $xoBlocks.page_topright)}>
-						<div id="xo-page-topblocks" class="xo-blockszone-xo-<{$theme_top_order}>pageblocks">
-							<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:0:1}>
-							<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:1:1}>
-							<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:2:1}>
-						</div>
-					<{/if}>
-
-					<{if $xoops_contents}>
-						<div id="xo-content">
-							<{$xoops_contents}>
-						</div>
-					<{/if}>
-
-					<{if $theme_view_bottomblock && ($xoBlocks.page_bottomleft or $xoBlocks.page_bottomcenter or $xoBlocks.page_bottomright)}>
-						<div id="xo-page-bottomblocks" class="xo-blockszone-xo-<{$theme_bottom_order}>pageblocks">
-							<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:0:1}>
-							<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:1:1}>
-							<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:2:1}>
-						</div>
-					<{/if}>
-				</td>
-					<{if $xoBlocks.canvas_right && $theme_view_rightcolumn}>
-						<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_right
-							zoneClass='xo-canvas-column' zoneId='xo-canvas-rightcolumn' zoneTag='td'
-						}>
-					<{/if}>
-			</tr>
-			</table>
-
-			<!--<{if $xoBlocks.canvas_bottom}>
-				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_bottom
-					zoneClass='' zoneId='xo-canvas-footer'
-					}>
-			<{/if}>-->
-			
-			<!-- INCLUDE BOTTOM PAGE" -->
-			<{includeq file="$theme_name/xo_bottompage.html"}>
-
-		</div>
-		<!-- INCLUDE FOOTER -->
-		<{includeq file="$theme_name/xo_footer.html"}>
-	</div>
-	<!--{xo-logger-output}-->
-</div>
-	<!-- INCLUDE BARADMIN - xo_footerstatic.html -->
-	<{if $xoops_isadmin && $theme_view_baradmin}><{includeq file="$theme_name/xo_footerstatic.html"}><{/if}>
-</body>
-</html>
\ No newline at end of file
+<{php}>
+/** If a module defines its own canvas template (located themes/themename/modules/dirname/xo_canvas.html), take it; otherwise the default canvas (themes/themename/xotpl/xo_canvas.html) is used. */
+	if(file_exists(XOOPS_ROOT_PATH."/themes/".$this->_tpl_vars["xoops_theme"]."/modules/".$this->_tpl_vars["xoops_dirname"]."/xo_canvas.html")) {
+		$this->assign("canvas_template", $this->_tpl_vars["xoops_theme"]."/modules/".$this->_tpl_vars["xoops_dirname"]."/xo_canvas.html");
+	}else{
+		$this->assign("canvas_template", $this->_tpl_vars["xoops_theme"]."/xotpl/xo_canvas.html");
+	}
+/** Defined an extra SMARTY variable $xoops_themeurl, which is identical to $xoops_imageurl, for literal consistence only */
+	$this->assign("xoops_themeurl", $this->_tpl_vars["xoops_url"]."/themes/".$this->_tpl_vars["xoops_theme"]);
+/** Defined an extra SMARTY variable $xoops_module_theme */
+	$this->assign("xoops_module_theme", $this->_tpl_vars["xoops_theme"]."/modules/".$this->_tpl_vars["xoops_dirname"]);
+/** If a module has its own css (located themes/themename/modules/dirname/style.css), append it to $xoops_module_header */
+	if(file_exists(XOOPS_ROOT_PATH."/themes/".$this->_tpl_vars["xoops_theme"]."/modules/".$this->_tpl_vars["xoops_dirname"]."/style.css")) {
+		$this->assign("xoops_module_header", 
+		$this->_tpl_vars["xoops_module_header"]."\n".
+		"<link rel=\"stylesheet\" type=\"text/css\" media=\"screen,projection\" href=\"".$this->_tpl_vars["xoops_themeurl"]."/modules/".$this->_tpl_vars["xoops_dirname"]."/style.css\"/>\n");
+	}
+<{/php}>
+	
+<{includeq file="$canvas_template"}>

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/theme.ini
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/theme.ini	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/theme.ini	2009-12-27 15:06:17 UTC (rev 4053)
@@ -6,16 +6,16 @@
 Description="Mor.pho.GEN.e.sis theme for XOOPS 2.4.x, 1/2 or 3 columns, full screen"
 
 ;Put a theme version
-Version="3.0.1"
+Version="3.1 beta 1"
 
 ;Put the theme framework and version
-Format="XOOPS Mor.pho.GEN.e.sis 3.0.1"
+Format="XOOPS Mor.pho.GEN.e.sis 3.1"
 
 ;Put the theme autor
 Author="Kris - XooFoo.org"
 
 ;Put the web link for theme demo
-Demo="http://theme.xoofoo.org/index.php?xoops_theme_select=morphogenesis_30"
+Demo="http://theme.xoofoo.org/index.php?xoops_theme_select=morphogenesis_31"
 
 ;Put the web link for support
 Url="http://labs.xoofoo.org/modules/newbb/"

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/xo-info.php
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xo-info.php	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xo-info.php	2009-12-27 15:06:17 UTC (rev 4053)
@@ -23,9 +23,17 @@
 
 
 return array(
-        'copyright'        => '&copy; AfuX.org, maintained by Kris - XooFoo.org',
-        // Types of language constants
-        "languages" => array("main", "admin"),
+    'copyright'       		=> '&copy; AfuX.org, maintained by Kris - XooFoo.org',
+	//'xoBundleIdentifier'	=> 'theme_morphogenesis',
+	//'xoBundleDisplayName'	=> 'XOOPS Morphogenesis 3 beta 1 (standards compliant)',
+	//'parentTheme'			=> 'morphogenesis',
+	// This theme default templates
+	// templates paths must start with a "." to be considered relative to the theme folder
+	//'canvasTemplate' => './xotpl/xo_canvas.html',
+	//'pageTemplate' => './xotpl/xo_page.html',
+	
+    // Types of language constants
+    "languages" => array("main", "admin"),
 );
 
 ?>

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_canvas.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_canvas.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_canvas.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,69 @@
+	<!-- Theme others parameters -->
+	<{includeq file="$theme_name/xo_thm_parameters.html"}>
+<!-- Metas, Titles, and Style Sheets -->
+	<{includeq file="$theme_name/xo_metas.html"}>
+<!-- Additionals Scripts -->
+	<{includeq file="$theme_name/xo_scripts.html"}>
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<{if $xoBlocks.canvas_left and $xoBlocks.canvas_right}><{assign var=columns_layout value='threecolumns-layout'}>
+<{elseif $xoBlocks.canvas_left}><{assign var=columns_layout value='leftcolumn-layout'}>
+<{elseif $xoBlocks.canvas_right}><{assign var=columns_layout value='rightcolumn-layout'}>
+<{/if}>
+<div id="xo-wrapper" class="<{$xoops_dirname}>">
+	<div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
+	<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
+
+		<!-- HEADER -->
+		<div id="xo-header" class="<{$xoops_dirname}>">
+
+			<!-- INCLUDE TOPHEADER -->
+			<{if $theme_view_topheader}><{includeq file="$theme_name/xo_topheader.html"}><{/if}>
+
+			<!-- INCLUDE HEADER WITH LOGO AND BANNER -->
+			<!-- checking whether the display of the banner is enabled or not in the site administration -->
+			<{if $xoops_banner and $xoops_banner != '&nbsp;'}>
+				<!-- INCLUDE WITH BANNER ACTIVED-->
+				<{includeq file="$theme_name/xo_banner_commercial.html"}>
+			<{else}>
+				<!-- INCLUDE WITH BANNER DESACTIVED -->
+				<{includeq file="$theme_name/xo_banner.html"}>
+			<{/if}>
+			<!-- INCLUDE HORIZONTAL MENU -->
+			<{if $theme_view_globalnav}><{includeq file="$theme_name/xo_globalnav.html"}><{/if}>
+		</div>
+		<!-- END HEADER -->
+		
+		<!-- INCLUDE HOMEPAGE FOR ANONYMOUS AND ONLY MAINPAGE (see comments in file xo_homepage.html -->
+		<{if $theme_view_homepage}><{includeq file="$theme_name/xo_homepage.html"}><{/if}>	
+		
+      <!-- CONTENT AREA -->
+		<!-- Do not change the part below is supposed to be the standard architecture that everyone should use -->
+		<div id="xo-canvas-content" class="<{$xoops_dirname}>">
+			<!--<{if $xoBlocks.canvas_top}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_top
+					zoneClass='' zoneId='xo-canvas-header'
+					}>
+			<{/if}>-->
+			
+			<{includeq file="$theme_name/xo_page.html"}>
+
+			<!--<{if $xoBlocks.canvas_bottom}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_bottom
+					zoneClass='' zoneId='xo-canvas-footer'
+					}>
+			<{/if}>-->
+			
+			<!-- INCLUDE BOTTOM PAGE" -->
+			<{includeq file="$theme_name/xo_bottompage.html"}>
+
+		</div>
+		<!-- INCLUDE FOOTER -->
+		<{includeq file="$theme_name/xo_footer.html"}>
+	</div>
+		<!--{xo-logger-output}-->
+</div>
+	<!-- INCLUDE BARADMIN - xo_footerstatic.html -->
+	<{if $xoops_isadmin && $theme_view_baradmin}><{includeq file="$theme_name/xo_footerstatic.html"}><{/if}>
+</body>
+</html>
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_homepage.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_homepage.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_homepage.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -1,6 +1,6 @@
 <{if $smarty.server.PHP_SELF=='/index.php'}>
 <!-- In the above line: if your site is at the root of the server, put '/index.php', otherwise '/foldername/index.php'
-If you have difficulty finding the path, add <{$smarty.server.PHP_SELF}> in first line of this file and the information displayed, then remove the line and this comments for safety issues
+If you have difficulty finding the path, add <{$smarty.server.PHP_SELF}> in first line of this file and the information displayed, then remove the line and this comments for safety issues  <{$xoops_rootpath}>
 Dans la ligne ci-dessus : si votre site est \xE0 la racine du serveur, mettez '/index.php', sinon '/nomdudossier/index.php'
 Si vous avez des difficult\xE9s \xE0 trouver le chemin,ins\xE9rer <{$smarty.server.PHP_SELF}> en premi\xE8re ligne de ce fichier et les informations s'afficheront, puis retirer la ligne et ce commentaire pour des questions de s\xE9curit\xE9 -->
 

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_metas.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_metas.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_metas.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -3,7 +3,7 @@
 <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
 <meta name="robots" content="<{$xoops_meta_robots}>" />
 <meta name="keywords" content="<{$xoops_pagetitle}>,<{$xoops_meta_keywords}>" />
-<meta name="description" content="<{$xoops_meta_description}>" />
+<meta name="description" content="<{$xoops_pagetitle}>, <{$xoops_meta_description}>" />
 <meta name="rating" content="<{$xoops_meta_rating}>" />
 <meta name="author" content="<{$xoops_meta_author}>" />
 <meta name="copyright" content="<{$xoops_meta_copyright}>" />
@@ -26,15 +26,15 @@
 <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
 <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
 
-<!-- include xoops.js and others via header.php -->
-<{$xoops_module_header}>
-
 <!-- Xoops style sheet -->
-<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl browse.php?style.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl browse.php?xoops.css}>" />
 
 <!-- Theme style sheets -->
 <link rel="stylesheet" type="text/css" media="screen,projection,print" href="<{xoImgUrl css/layout-soup.css}>" /><!-- canvas theme style sheet -->
 <!--<link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl css/style.css}>?v=<?= filemtime('<{xoImgUrl css/style.css}>'); ?>" />--><!-- only for development !! -->
 <link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl css/style.css}>" /> <!--for production -->
 <link rel="stylesheet" type="text/css" media="print" href="<{xoImgUrl css/print.css}>" />  <!-- print style sheet experimental -->
-<!--<link rel="stylesheet" type="text/css" media="aural" href="<{xoImgUrl /aural.css}>" />-->  <!-- audio style sheet -->
\ No newline at end of file
+<!--<link rel="stylesheet" type="text/css" media="aural" href="<{xoImgUrl /aural.css}>" />-->  <!-- audio style sheet -->
+
+<!-- include xoops.js and others via header.php -->
+<{$xoops_module_header}>
\ No newline at end of file

Added: XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_page.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_page.html	                        (rev 0)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_page.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -0,0 +1,40 @@
+<table id="xo-canvas-columns" summary="<{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> <{else}> <{$xoops_meta_description}><{/if}>">
+	<tr>
+		<{if $xoBlocks.canvas_left && $theme_view_leftcolumn}>
+			<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_left
+				zoneClass='xo-canvas-column' zoneId='xo-canvas-leftcolumn' zoneTag='td'
+				}>
+		<{/if}>
+
+		<td id="xo-page">
+			<{if $theme_view_breadcrumb}><{includeq file="$theme_name/xo_breadcrumb.html"}><{/if}>
+
+			<{if $theme_view_topblock && ($xoBlocks.page_topleft or $xoBlocks.page_topcenter or $xoBlocks.page_topright)}>
+				<div id="xo-page-topblocks" class="xo-blockszone-xo-<{$theme_top_order}>pageblocks">
+					<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:0:1}>
+					<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:1:1}>
+					<{includeq file="$theme_name/centerblocks.html" topbottom=top lcr=$theme_top_order|substr:2:1}>
+				</div>
+			<{/if}>
+
+			<{if $xoops_contents}>
+				<div id="xo-content">
+					<{$xoops_contents}>
+				</div>
+			<{/if}>
+
+			<{if $theme_view_bottomblock && ($xoBlocks.page_bottomleft or $xoBlocks.page_bottomcenter or $xoBlocks.page_bottomright)}>
+				<div id="xo-page-bottomblocks" class="xo-blockszone-xo-<{$theme_bottom_order}>pageblocks">
+					<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:0:1}>
+					<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:1:1}>
+					<{includeq file="$theme_name/centerblocks.html" topbottom=bottom lcr=$theme_bottom_order|substr:2:1}>
+				</div>
+			<{/if}>
+		</td>
+			<{if $xoBlocks.canvas_right && $theme_view_rightcolumn}>
+				<{includeq file="$theme_name/blockszone.html" blocks=$xoBlocks.canvas_right
+					zoneClass='xo-canvas-column' zoneId='xo-canvas-rightcolumn' zoneTag='td'
+				}>
+			<{/if}>
+	</tr>
+</table>
\ No newline at end of file

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_thm_parameters.html
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_thm_parameters.html	2009-12-26 18:44:37 UTC (rev 4052)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/xotpl/xo_thm_parameters.html	2009-12-27 15:06:17 UTC (rev 4053)
@@ -2,7 +2,7 @@
 	<{* Center blocks display order valid values are:  lrc (left right / center) lcr (left center right) clr (center / left right)	*}>
 	<{assign var=theme_top_order value=l...
 
[truncated message content]

Revision: 4052
          http://xoops.svn.sourceforge.net/xoops/?rev=4052&view=rev
Author:   trabis
Date:     2009-12-26 18:44:37 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Fixed bug #2915970 : Banner white page on IE, adding new language defines into banners.php

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt
    XoopsCore/trunk/htdocs/banners.php
    XoopsCore/trunk/htdocs/language/english/banners.php

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-26 18:44:37 UTC (rev 4052)
@@ -1,7 +1,7 @@
 XOOPS Changelog
 
 ===============================
-2009/12/05: Version 2.4.3
+2009/12/26: Version 2.4.3
 ===============================
 Updates upon community:
 - Added: Ability to assign display elements to a specific group of users (ghia)
@@ -19,7 +19,13 @@
 - Fixed bug #2911944 : Users can see other users profile in edit profile (trabis/ghia)
 - Fixed bug #2910495 : BBcode code tag handles code worse than quote tag (trabis/ghia)
 - Fixed bug #2914175 : code tags translate to double tags and alter first line (trabis/ghia)
+- Fixed bug #2915970 : Banner white page on IE (trabis/gia)
 
+Added Language defines:
+  language/english/banners.php _BANNERS_NO_LOGIN_DATA
+  language/english/banners.php _BANNERS_NO_REFERER
+  language/english/banners.php _BANNERS_NO_ID
+
 ===============================
 2009/11/28: Version 2.4.2
 ===============================

Modified: XoopsCore/trunk/htdocs/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/banners.php	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/htdocs/banners.php	2009-12-26 18:44:37 UTC (rev 4052)
@@ -91,7 +91,7 @@
           <div class='actions'><input type='hidden' name='op' value='Ok' /><button type='submit'>" . _BANNERS_LOGIN_OK . "</button></div>
           <div class='login_info'>" . _BANNERS_LOGIN_INFO . "</div>" . $GLOBALS['xoopsSecurity']->getTokenHTML("BANNER_LOGIN") . "
           </form></div>";
-    include "footer.php";
+    include $GLOBALS['xoops']->path('footer.php');
 }
 
 /*********************************************/
@@ -102,7 +102,7 @@
 {
     global $xoopsDB, $xoopsConfig, $xoopsLogger;
     if ($_SESSION['banner_login'] == "" || $_SESSION['banner_pass'] == "") {
-        redirect_header("banners.php", 2, 'No login data detected');
+        redirect_header("banners.php", 2, _BANNERS_NO_LOGIN_DATA);
         exit();
     }
     $result = $xoopsDB->query(sprintf("SELECT cid, name, passwd FROM %s WHERE login=%s", $xoopsDB->prefix("bannerclient"), $xoopsDB->quoteString($_SESSION['banner_login'])));
@@ -130,7 +130,7 @@
               <td>" . _BANNERS_FUNCTIONS . "</td></tr></thead>
               <tfoot><tr><td colspan='7'></td></tr></tfoot>";
 
-        $result = $xoopsDB->query("select bid, imptotal, impmade, clicks, date from " . $xoopsDB->prefix("banner") . " where cid=$cid");
+        $result = $xoopsDB->query("SELECT bid, imptotal, impmade, clicks, date FROM " . $xoopsDB->prefix("banner") . " WHERE cid={$cid}");
         $i = 0;
         while (list ($bid, $imptotal, $impmade, $clicks, $date) = $xoopsDB->fetchRow($result)) {
             if ($impmade == 0) {
@@ -144,21 +144,21 @@
                 $left = $imptotal - $impmade;
             }
             $class = ($i % 2 == 0) ? 'even' : 'odd';
-            echo "<tbody><tr class='$class'>
-                  <td>$bid</td>
-                  <td>$impmade</td>
-                  <td>$imptotal</td>
-                  <td>$left</td>
-                  <td>$clicks</td>
-                  <td>$percent%</td>
-                  <td><a href='banners.php?op=EmailStats&amp;cid=$cid&amp;bid=$bid' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
-            $i ++;
+            echo "<tbody><tr class='{$class}'>
+                  <td>{$bid}</td>
+                  <td>{$impmade}</td>
+                  <td>{$imptotal}</td>
+                  <td>{$left}</td>
+                  <td>{$clicks}</td>
+                  <td>{$percent}%</td>
+                  <td><a href='banners.php?op=EmailStats&amp;cid={$cid}&amp;bid={$bid}' title='" . _BANNERS_STATS . "'>" . _BANNERS_STATS . "</a></td></tr></tbody>";
+            $i++;
         }
         echo "</table>
               <br /><br />
               <h4 class='content_title'>" . _BANNERS_FOW_IN . htmlspecialchars($xoopsConfig['sitename']) . "</h4><hr />";
 
-        $result = $xoopsDB->query("select bid, imageurl, clickurl, htmlbanner, htmlcode from " . $xoopsDB->prefix("banner") . " where cid=$cid");
+        $result = $xoopsDB->query("SELECT bid, imageurl, clickurl, htmlbanner, htmlcode FROM " . $xoopsDB->prefix("banner") . " WHERE cid={$cid}");
         while (list ($bid, $imageurl, $clickurl, $htmlbanner, $htmlcode) = $xoopsDB->fetchRow($result)) {
             $numrows = $xoopsDB->getRowsNum($result);
             if ($numrows > 1) {
@@ -190,7 +190,7 @@
 
         /* Finnished Banners */
         echo "<br />";
-        if ($result = $xoopsDB->query("select bid, impressions, clicks, datestart, dateend from " . $xoopsDB->prefix("bannerfinish") . " where cid=$cid")) {
+        if ($result = $xoopsDB->query("SELECT bid, impressions, clicks, datestart, dateend FROM " . $xoopsDB->prefix("bannerfinish") . " WHERE cid={$cid}")) {
             echo "<h4 class='content_title'>" . sprintf(_BANNERS_FINISHED, $name) . "</h4><hr />
                   <table summary=''>
                   <caption>" . sprintf(_BANNERS_FINISHED, $name) . "</caption>
@@ -234,14 +234,14 @@
     if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "") {
         $cid = intval($cid);
         $bid = intval($bid);
-        if ($result2 = $xoopsDB->query(sprintf("select name, email, passwd from %s where cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
+        if ($result2 = $xoopsDB->query(sprintf("SELECT name, email, passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) {
             list ($name, $email, $passwd) = $xoopsDB->fetchRow($result2);
             if ($_SESSION['banner_pass'] == $passwd) {
                 if ($email == "") {
                     redirect_header("banners.php", 3, sprintf(_BANNERS_MAIL_ERROR, $name));
                     exit();
                 } else {
-                    if ($result = $xoopsDB->query("select bid, imptotal, impmade, clicks, imageurl, clickurl, date from " . $xoopsDB->prefix("banner") . " where bid=$bid and cid=$cid")) {
+                    if ($result = $xoopsDB->query("SELECT bid, imptotal, impmade, clicks, imageurl, clickurl, date FROM " . $xoopsDB->prefix("banner") . " WHERE bid={$bid} AND cid={$cid}")) {
                         list ($bid, $imptotal, $impmade, $clicks, $imageurl, $clickurl, $date) = $xoopsDB->fetchRow($result);
                         if ($impmade == 0) {
                             $percent = 0;
@@ -286,13 +286,13 @@
     if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "" && $url != "") {
         $cid = intval($cid);
         $bid = intval($bid);
-        $sql = sprintf("select passwd from %s where cid=%u and login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
+        $sql = sprintf("SELECT passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login']));
         if ($result = $xoopsDB->query($sql)) {
             list ($passwd) = $xoopsDB->fetchRow($result);
             if ($_SESSION['banner_pass'] == $passwd) {
-                $sql = sprintf("update %s set clickurl=%s where bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
+                $sql = sprintf("UPDATE %s SET clickurl=%s WHERE bid=%u AND cid=%u", $xoopsDB->prefix("banner"), $xoopsDB->quoteString($url), $bid, $cid);
                 if ($xoopsDB->query($sql)) {
-                    redirect_header("banners.php?op=Ok", 3, "URL has been changed.");
+                    redirect_header("banners.php?op=Ok", 3, _BANNERS_DBUPDATED);
                     exit();
                 }
             }
@@ -311,24 +311,23 @@
         list ($clickurl) = $xoopsDB->fetchRow($bresult);
         if ($clickurl) {
             if ($GLOBALS['xoopsSecurity']->checkReferer()) {
-                $xoopsDB->queryF("update " . $xoopsDB->prefix("banner") . " set clicks=clicks+1 where bid=$bid");
+                $xoopsDB->queryF("UPDATE " . $xoopsDB->prefix("banner") . " SET clicks=clicks+1 WHERE bid=$bid");
                 header('Location: ' . $clickurl);
             } else {
                 //No valid referer found so some javascript error or direct access found
-                //Display a link but do not update counter
-                echo sprintf(_BANNERS_POINTS, $clickurl);
+                echo _BANNERS_NO_REFERER;
             }
             exit();
         }
     }
-    redirect_header(XOOPS_URL, 3, _ERRORS);
+    redirect_header(XOOPS_URL, 3, _BANNERS_NO_ID);
     exit();
 }
 
 $op = '';
 if (!empty($_POST['op'])) {
     $op = $_POST['op'];
-} elseif (!empty($_GET['op'])) {
+} else if (!empty($_GET['op'])) {
     $op = $_GET['op'];
 }
 

Modified: XoopsCore/trunk/htdocs/language/english/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/language/english/banners.php	2009-12-26 17:01:58 UTC (rev 4051)
+++ XoopsCore/trunk/htdocs/language/english/banners.php	2009-12-26 18:44:37 UTC (rev 4052)
@@ -71,4 +71,8 @@
 define('_BANNERS_DBUPDATED', 'Item modified and database updated');
 define('_BANNERS_DBERROR', 'Database was not updated due to an error!');
 define('_BANNERS_CHANGE', 'Change');
+
+define('_BANNERS_NO_LOGIN_DATA', 'No login data detected');
+define('_BANNERS_NO_REFERER', 'No referer detected');
+define('_BANNERS_NO_ID', 'No valid ID detected');
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4051
          http://xoops.svn.sourceforge.net/xoops/?rev=4051&view=rev
Author:   trabis
Date:     2009-12-26 17:01:58 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Fix [code] backslashes problem

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php

Property Changed:
----------------
    XoopsCore/trunk/htdocs/


Property changes on: XoopsCore/trunk/htdocs
___________________________________________________________________
Modified: svn:ignore
   - *.bak
mainfile.php
upgrade
common
php-openid-2.1.3
phpsysinfo
phpsecinfo


   + *.bak
mainfile.php
upgrade
common
php-openid-2.1.3
phpsysinfo
phpsecinfo
teste.php


Modified: XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-23 16:58:05 UTC (rev 4050)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-26 17:01:58 UTC (rev 4051)
@@ -34,7 +34,6 @@
 
     function php($text)
     {
-        //$text = trim($text);
         $addedtag_open = 0;
         if (!strpos($text, "<?php") and (substr($text, 0, 5) != "<?php")) {
             $text = "<?php " . $text;
@@ -46,7 +45,16 @@
             $addedtag_close = 1;
         }
         $oldlevel = error_reporting(0);
+
+        //There is a bug in the highlight function(php < 5.3) that it doesn't render
+        //backslashes properly like in \s. So here we replace any backslashes
+        $text = str_replace("\\", "XxxX", $text);
+
         $buffer = highlight_string($text, true); // Require PHP 4.20+
+
+        //Placing backspaces back again
+        $buffer = str_replace("XxxX", "\\", $buffer);
+
         error_reporting($oldlevel);
         $pos_open = $pos_close = 0;
         if ($addedtag_open) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4050
          http://xoops.svn.sourceforge.net/xoops/?rev=4050&view=rev
Author:   kris_fr
Date:     2009-12-23 16:58:05 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
cosmetic css in morphogenesis trunk

Modified Paths:
--------------
    XoopsThemes/PublicInterface/morphogenesis/trunk/css/blockfooter.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/css/content.css
    XoopsThemes/PublicInterface/morphogenesis/trunk/css/style.css

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/css/blockfooter.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/css/blockfooter.css	2009-12-23 00:04:48 UTC (rev 4049)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/css/blockfooter.css	2009-12-23 16:58:05 UTC (rev 4050)
@@ -50,7 +50,7 @@
 	padding :					.5em;
 	line-height: 				1.4em;
 }
-#xo-blockfooter .outer {}
+#xo-blockfooter .outer {background-color: transparent; color:inherit;}
 #xo-blockfooter .head {}
 #xo-blockfooter .even {}
 #xo-blockfooter .odd {}

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/css/content.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/css/content.css	2009-12-23 00:04:48 UTC (rev 4049)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/css/content.css	2009-12-23 16:58:05 UTC (rev 4050)
@@ -150,7 +150,6 @@
 	border: 							0 !important;*/
 }
 #xo-canvas-content .outer {	border: #ccc 1px solid;}
-#xo-blockfooter .outer {background-color: transparent; color:inherit;}
 .xo-canvas-column .outer, .xo-canvas-column td.outer { /* general central zone */}
 #xo-canvas-content .head {
 	background-color: 		#f5f5f5;

Modified: XoopsThemes/PublicInterface/morphogenesis/trunk/css/style.css
===================================================================
--- XoopsThemes/PublicInterface/morphogenesis/trunk/css/style.css	2009-12-23 00:04:48 UTC (rev 4049)
+++ XoopsThemes/PublicInterface/morphogenesis/trunk/css/style.css	2009-12-23 16:58:05 UTC (rev 4050)
@@ -35,7 +35,7 @@
 @font-face { font-family: BakerSignet BT; font-style:  normal; font-weight: normal; src: url(../fonts/BAKERSI3.eot);}
 
 /* reset css for web browsers*/
-* { margin: 0; padding: 0; border: 0; outline: none; text-decoration: none;font-family: sans-serif; font-size: 1em; font-weight: normal; font-style: normal;}
+* { margin: 0; padding: 0; border: 0; outline: none; text-decoration: none;font-family: sans-serif; font-size: 1em; font-weight: normal; font-style: normal; resize:none;}
 /*  for html 5 in next time */
 article, aside, dialog, figure, footer, header, hgroup, menu, nav, section { display: block;}
 
@@ -178,7 +178,7 @@
 	text-decoration: 			underline;
 }
 
-#xo-blockfooter { /* see also in block.css */ }
+#xo-blockfooter { /* see also in blockfooter.css */ }
 
 #xo-footerbottom {
 	clear:						both;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4049
          http://xoops.svn.sourceforge.net/xoops/?rev=4049&view=rev
Author:   trabis
Date:     2009-12-23 00:04:48 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
Adding error handling for banners.php. If javascript fails or direct access is found, a link to the target url will be displayed but the counter will not be updated. If an invalid id is provided, user will be redirected to front page.

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/banners.php

Modified: XoopsCore/trunk/htdocs/banners.php
===================================================================
--- XoopsCore/trunk/htdocs/banners.php	2009-12-22 23:17:59 UTC (rev 4048)
+++ XoopsCore/trunk/htdocs/banners.php	2009-12-23 00:04:48 UTC (rev 4049)
@@ -307,14 +307,21 @@
     global $xoopsDB;
     $bid = intval($bid);
     if ($bid > 0) {
-        if ($GLOBALS['xoopsSecurity']->checkReferer()) {
-            if ($bresult = $xoopsDB->query("select clickurl from " . $xoopsDB->prefix("banner") . " where bid=$bid")) {
-                list ($clickurl) = $xoopsDB->fetchRow($bresult);
+        $bresult = $xoopsDB->query("SELECT clickurl FROM " . $xoopsDB->prefix("banner") . " WHERE bid={$bid}");
+        list ($clickurl) = $xoopsDB->fetchRow($bresult);
+        if ($clickurl) {
+            if ($GLOBALS['xoopsSecurity']->checkReferer()) {
                 $xoopsDB->queryF("update " . $xoopsDB->prefix("banner") . " set clicks=clicks+1 where bid=$bid");
                 header('Location: ' . $clickurl);
+            } else {
+                //No valid referer found so some javascript error or direct access found
+                //Display a link but do not update counter
+                echo sprintf(_BANNERS_POINTS, $clickurl);
             }
+            exit();
         }
     }
+    redirect_header(XOOPS_URL, 3, _ERRORS);
     exit();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4048
          http://xoops.svn.sourceforge.net/xoops/?rev=4048&view=rev
Author:   trabis
Date:     2009-12-22 23:17:59 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Fixing [code] bug (again), hope now is for real!

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/class/module.textsanitizer.php
    XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php

Modified: XoopsCore/trunk/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-20 11:40:59 UTC (rev 4047)
+++ XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-22 23:17:59 UTC (rev 4048)
@@ -476,8 +476,7 @@
      */
     function htmlSpecialChars($text, $quote_style = ENT_QUOTES, $charset = 'ISO-8859-1', $double_encode = true)
     {
-        // return preg_replace('/&/i', '&', htmlspecialchars($text, ENT_QUOTES));
-        if (version_compare(phpversion(), '5.2.3', '>=')) {
+         if (version_compare(phpversion(), '5.2.3', '>=')) {
             $text = htmlspecialchars($text, $quote_style, $charset, $double_encode);
         } else {
             $text = htmlspecialchars($text, $quote_style);
@@ -485,11 +484,6 @@
         return $text;
      }
 
-     function undoSafeHSC($text)
-     {
-        return preg_replace(array('/&/i'), array('&'), $text);
-     }
-
     /**
      * Reverses {@link htmlSpecialChars()}
      *
@@ -498,7 +492,7 @@
      */
     function undoHtmlSpecialChars($text)
     {
-        return preg_replace(array('/&gt;/i' , '/&lt;/i' , '/&quot;/i' , '/&#039;/i' , '/&amp;nbsp;/i'), array('>' , '<' , '"' , '\'' , "&nbsp;"), $text);
+        return preg_replace(array('/&gt;/i' , '/&lt;/i' , '/&quot;/i' , '/&#039;/i' , '/&amp;/i'), array('>' , '<' , '"' , '\'' , '&'), $text);
     }
 
     /**
@@ -514,12 +508,11 @@
      */
     function &displayTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
+        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         if ($html != 1) {
             // html not allowed
             $text = $this->htmlSpecialChars($text);
-            $text = $this->undoSafeHSC($text);
         }
-        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         if ($smiley != 0) {
             // process smiley
             $text = $this->smiley($text);

Modified: XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-20 11:40:59 UTC (rev 4047)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-22 23:17:59 UTC (rev 4048)
@@ -20,8 +20,6 @@
         if (empty($config['highlight'])) {
             return "<pre>{$source}</pre>";
         }
-        $source = $ts->undoHtmlSpecialChars($source);
-        //$source = stripslashes($source);
         if ($config['highlight'] == 'geshi') {
             $language = str_replace('=', '', $language);
             $language = ($language) ? $language : $config['language'];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4047
          http://xoops.svn.sourceforge.net/xoops/?rev=4047&view=rev
Author:   trabis
Date:     2009-12-20 11:40:59 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
[Code] tag problem... maybe now?

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt
    XoopsCore/trunk/htdocs/class/module.textsanitizer.php
    XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-19 20:22:21 UTC (rev 4046)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-20 11:40:59 UTC (rev 4047)
@@ -13,7 +13,6 @@
 - Fixed : Database images not loading when using php 5.3 (trabis)
 
 Updates from Sourceforge trackers:
-- Fixed bug #2909799 : Unbalanced [quote] introduces unbalanced <div> tag (ghia)
 - Fixed bug #2909312 : Layout of XoopsForms is changed (trabis/ghia)
 - Fixed bug #2904777 : preload including not installed module's preloads (trabis/bandit-x)
 - Fixed bug #2908887 : User can not select system avatars (trabis/ghia)

Modified: XoopsCore/trunk/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-19 20:22:21 UTC (rev 4046)
+++ XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-20 11:40:59 UTC (rev 4047)
@@ -482,9 +482,14 @@
         } else {
             $text = htmlspecialchars($text, $quote_style);
         }
-        return $text;//preg_replace(array('/&amp;/i' , '/&nbsp;/i'), array('&' , '&amp;nbsp;'), $text);
+        return $text;
      }
 
+     function undoSafeHSC($text)
+     {
+        return preg_replace(array('/&amp;/i'), array('&'), $text);
+     }
+
     /**
      * Reverses {@link htmlSpecialChars()}
      *
@@ -512,6 +517,7 @@
         if ($html != 1) {
             // html not allowed
             $text = $this->htmlSpecialChars($text);
+            $text = $this->undoSafeHSC($text);
         }
         $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         if ($smiley != 0) {
@@ -533,7 +539,7 @@
         }
         $text = $this->codeConv($text, $xcode);
         $text = $this->makeClickable($text);
-        if (! empty($this->config['filterxss_on_display'])) {
+        if (!empty($this->config['filterxss_on_display'])) {
             $text = $this->filterXss($text);
         }
         return $text;

Modified: XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-19 20:22:21 UTC (rev 4046)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-20 11:40:59 UTC (rev 4047)
@@ -20,7 +20,7 @@
         if (empty($config['highlight'])) {
             return "<pre>{$source}</pre>";
         }
-        //$source = $ts->undoHtmlSpecialChars($source);
+        $source = $ts->undoHtmlSpecialChars($source);
         //$source = stripslashes($source);
         if ($config['highlight'] == 'geshi') {
             $language = str_replace('=', '', $language);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4046
          http://xoops.svn.sourceforge.net/xoops/?rev=4046&view=rev
Author:   trabis
Date:     2009-12-19 20:22:21 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
Reverting to 2.3.x xoopsExternalLinks() to avoid banner problem.

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/include/xoops.js

Modified: XoopsCore/trunk/htdocs/include/xoops.js
===================================================================
--- XoopsCore/trunk/htdocs/include/xoops.js	2009-12-19 20:19:24 UTC (rev 4045)
+++ XoopsCore/trunk/htdocs/include/xoops.js	2009-12-19 20:22:21 UTC (rev 4046)
@@ -213,10 +213,11 @@
             // Check rel value with extra rels, like "external noflow". No test for performance yet
             var $pattern = new RegExp("external", "i");
             if ($pattern.test(anchor.getAttribute("rel"))) {
-                anchor. {
+                /*anchor. {
                     window.open(this.href);
                     return false;
-                }
+                }*/
+                anchor.target = "_blank";
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4045
          http://xoops.svn.sourceforge.net/xoops/?rev=4045&view=rev
Author:   trabis
Date:     2009-12-19 20:19:24 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
[code]&[/code] turns into & while editing

Modified Paths:
--------------
    XoopsCore/trunk/htdocs/class/module.textsanitizer.php

Modified: XoopsCore/trunk/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-19 13:13:57 UTC (rev 4044)
+++ XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-19 20:19:24 UTC (rev 4045)
@@ -482,8 +482,8 @@
         } else {
             $text = htmlspecialchars($text, $quote_style);
         }
-        return preg_replace(array('/&/i' , '/ /i'), array('&' , ' '), $text);
-    }
+        return $text;//preg_replace(array('/&/i' , '/ /i'), array('&' , ' '), $text);
+     }
 
     /**
      * Reverses {@link htmlSpecialChars()}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4044
          http://xoops.svn.sourceforge.net/xoops/?rev=4044&view=rev
Author:   trabis
Date:     2009-12-19 13:13:57 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
Fixed bug #2914175 : code tags translate to double tags and alter first line

Modified Paths:
--------------
    XoopsCore/trunk/docs/changelog.txt
    XoopsCore/trunk/htdocs/class/module.textsanitizer.php
    XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php

Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt	2009-12-19 00:21:57 UTC (rev 4043)
+++ XoopsCore/trunk/docs/changelog.txt	2009-12-19 13:13:57 UTC (rev 4044)
@@ -5,8 +5,9 @@
 ===============================
 Updates upon community:
 - Added: Ability to assign display elements to a specific group of users (ghia)
-- Added : Smarty variable for xoops_avatar (trabis)
+- Added : Smarty variable for xoops_avatar (kris_fr/trabis)
 - Added: Cache supported functions: xoops_getActiveModules(), xoops_setActiveModules(), xoops_isActiveModule() (trabis)
+- Added: XoopsMailer - Adding method to set 'allow html' parameter (Wishcraft)
 - Improved: Preloads are only loaded for modules installed and active, this will reduce queries and improve performance (trabis)
 - Fixed : XoopsLoad class (xoops calendar not found and other issues) (trabis)
 - Fixed : Database images not loading when using php 5.3 (trabis)
@@ -18,6 +19,7 @@
 - Fixed bug #2908887 : User can not select system avatars (trabis/ghia)
 - Fixed bug #2911944 : Users can see other users profile in edit profile (trabis/ghia)
 - Fixed bug #2910495 : BBcode code tag handles code worse than quote tag (trabis/ghia)
+- Fixed bug #2914175 : code tags translate to double tags and alter first line (trabis/ghia)
 
 ===============================
 2009/11/28: Version 2.4.2

Modified: XoopsCore/trunk/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-19 00:21:57 UTC (rev 4043)
+++ XoopsCore/trunk/htdocs/class/module.textsanitizer.php	2009-12-19 13:13:57 UTC (rev 4044)
@@ -603,7 +603,7 @@
             return $text;
         }
         $patterns = "/\[code([^\]]*?)\](.*)\[\/code\]/esU";
-        $replacements = "'<div class=\"xoopsCode\"><code>'.\$this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode('$2')), '$1').'</code></div>'";
+        $replacements = "'<div class=\"xoopsCode\">'.\$this->executeExtension('syntaxhighlight', str_replace('\\\"', '\"', base64_decode('$2')), '$1').'</div>'";
         $text = preg_replace($patterns, $replacements, $text);
         return $text;
     }

Modified: XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-19 00:21:57 UTC (rev 4043)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php	2009-12-19 13:13:57 UTC (rev 4044)
@@ -36,10 +36,10 @@
 
     function php($text)
     {
-        $text = trim($text);
+        //$text = trim($text);
         $addedtag_open = 0;
         if (!strpos($text, "<?php") and (substr($text, 0, 5) != "<?php")) {
-            $text = "<?php\n" . $text;
+            $text = "<?php " . $text;
             $addedtag_open = 1;
         }
         $addedtag_close = 0;
@@ -52,7 +52,7 @@
         error_reporting($oldlevel);
         $pos_open = $pos_close = 0;
         if ($addedtag_open) {
-            $pos_open = strpos($buffer, '&lt;?php');
+            $pos_open = strpos($buffer, '&lt;?php&nbsp;');
         }
         if ($addedtag_close) {
             $pos_close = strrpos($buffer, '?&gt;');
@@ -61,7 +61,7 @@
         $str_open = ($addedtag_open) ? substr($buffer, 0, $pos_open) : "";
         $str_close = ($pos_close) ? substr($buffer, $pos_close + 5) : "";
 
-        $length_open = ($addedtag_open) ? $pos_open + 8 : 0;
+        $length_open = ($addedtag_open) ? $pos_open + 14 : 0;
         $length_text = ($pos_close) ? $pos_close - $length_open : 0;
         $str_internal = ($length_text) ? substr($buffer, $length_open, $length_text) : substr($buffer, $length_open);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.