You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
(110) |
2
|
|
3
(5) |
4
|
5
|
6
|
7
(3) |
8
|
9
|
|
10
|
11
(126) |
12
|
13
(25) |
14
(1) |
15
|
16
|
|
17
|
18
(9) |
19
(33) |
20
(1) |
21
|
22
|
23
|
|
24
|
25
|
26
(1) |
27
|
28
(2) |
29
|
30
|
|
31
(41) |
|
|
|
|
|
|
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:49:57
|
Update of /cvsroot/xoops/xoops2/themes/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19606/themes/default Modified Files: Tag: xoops2_1_0-branch page_default.stytpl theme.css theme_block.stytpl theme_blocks.css theme_layout.css Added Files: Tag: xoops2_1_0-branch page_admin.stytpl theme_blocks_zone.stytpl theme_forms.css xoops.js Log Message: Global update of the default theme. NB: we'll design this one for modern browsers first, then make a Win-IE compatible version once it's finished --- NEW FILE: page_admin.stytpl --- <{document->doctype}> <html xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>" <{document->namespaces}> ><head> <{* $Id: page_admin.stytpl,v 1.1.2.1 2004/10/31 23:49:46 skalpa Exp $ *}> <!-- Xoops default theme --> <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" /> <meta http-equiv="content-language" content="<{$xoops_langcode}>" /> <!--XOOPS_DOCUMENT_METAS--> <link rel="stylesheet" type="text/css" media="screen" href="<{resourceUrl /theme.css}>" /> <link href="<{resourceUrl /www/favicon.ico}>" rel="SHORTCUT ICON" /> <{$theme->titleString}> <title><{$xoops_sitename}> - <{$xoops_pagetitle}></title> <{$xoops_module_header}> </head> <body> <div class="page-header" id="page-header"> <a class="page-logo" href="<{$xoops2->services.path->makeUrl('/')}>"><span> <img src="<{resourceUrl /images/logo.png}>" alt="Xoops" /> </span></a> <div id="page-globalbar"> Navbar to access other subsites goes here </div> <div class="theme-blocks" id="page-menubar"> Global navigation tools go here </div> </div> <{include file="xoops:theme_blocks_zone" name='left_column' items=$xoops_lblocks}> <{include file="xoops:theme_blocks_zone" name='right_column' items=$xoops_rblocks}> <div id="page-center_column"> <{if !empty($xoops2->services.hal->redirectMessage)}> <div id="xoops-message"><{$xoops2->services.hal->redirectMessage}></div> <{/if}> <{include file="xoops:theme_blocks_zone" name='center_top_left' items=$xoops_clblocks}> <{include file="xoops:theme_blocks_zone" name='center_top_right' items=$xoops_crblocks}> <{include file="xoops:theme_blocks_zone" name='center_top' items=$xoops_ccblocks}> <div id="content"> <{$xoops_contents}> </div> </div> <div id="page-footer" class="theme_footer theme_bar"> <{include file="xoops:library/.xoops.arch.logger/logger"}> <a href="http://www.xoops.org/">Powered by XOOPS © 2oo2-2oo4 The XOOPS project.</a> </div> </body> </html> Index: theme_blocks.css =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/Attic/theme_blocks.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** theme_blocks.css 31 Oct 2004 14:29:27 -0000 1.1.2.1 --- theme_blocks.css 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 1,17 **** /* $Id$ */ ! .column_left .block { ! border-bottom: 1px solid #dddddd; } ! .column_left .blockcontent { ! padding: .2em 0px .5em; } ! .column_left .blocktitle { ! color: #666666; ! padding: .3em .9em .1em; ! font-weight: bold; } #content .block { border: 1px solid black; --- 1,62 ---- /* $Id$ */ ! .block .title, table.block thead { ! font-weight: bold; } ! ! .block .footer, table.block tfoot { ! font-size: 90%; } ! /* --------------- Left column --------------- */ ! #page-left_column .block { ! margin: 10px 4px 0em; ! background: #BBC0CC; ! color: #000000; ! -moz-border-radius: 6px; ! } ! ! #page-left_column .block .title, #page-left_column .block .footer { ! padding: 2px 6px; ! } ! ! #page-left_column .block .content { ! background: #C9CCD1; ! padding: 2px 6px; ! } ! ! #page-left_column .block ul { ! font-size: 85%; ! list-style-type: none; ! padding: 0px; ! margin: 0px; ! } ! #page-left_column .block li { ! padding: 1px 0px 1px 6px; ! } ! ! #page-left_column .block ul a { ! display: block; } + #page-left_column .block ul li:hover { + background-color: #D9DBDF; + } + + #page-left_column .block a { + text-decoration: none; + color: #39597C; + } + + #page-left_column .block a:hover { + color: #000000; + } + + #page-left_column .block .content > form + padding: 2px 6px; + } + + /* --------------- Left column --------------- */ + #content .block { border: 1px solid black; *************** *** 56,78 **** table.block tbody th { text-align: left; ! } ! ! ul.menu { ! font-size: 85%; ! } ! ! ul.menu, ul.menu ul { ! list-style-type: none; ! padding: 0px 1em 0px 1em; ! margin: 0px; ! } ! ! ul.menu a { ! display: block; ! text-decoration: none; ! color: #639AD6; ! } ! ul.menu a:hover { ! color: #00558B; ! background-color: #EEEEFF; ! } --- 101,103 ---- table.block tbody th { text-align: left; ! } \ No newline at end of file --- NEW FILE: xoops.js --- /* $Id: xoops.js,v 1.1.2.1 2004/10/31 23:49:46 skalpa Exp $ */ function xoopsGetElementById(id){ if (document.getElementById) { return (document.getElementById(id)); } else if (document.all) { return (document.all[id]); } else { if ((navigator.appname.indexOf("Netscape") != -1) && parseInt(navigator.appversion == 4)) { return (document.layers[id]); } } } function xoopsSetElementProp(name, prop, val) { var elt=xoopsGetElementById(name); if (elt) elt[prop]=val; } function xoopsSetElementStyle(name, prop, val) { var elt=xoopsGetElementById(name); if (elt && elt.style) elt.style[prop]=val; } function xoopsGetFormElement(fname, ctlname) { var frm=document.forms[fname]; return frm?frm.elements[ctlname]:null; } function justReturn() { return; } function openWithSelfMain(url,name,width,height) { var options = "width=" + width + ",height=" + height + "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no"; new_window = window.open(url, name, options); window.self.name = "main"; new_window.focus(); } function setElementColor(id, color){ xoopsGetElementById(id).style.color = "#" + color; } function setElementFont(id, font){ xoopsGetElementById(id).style.fontFamily = font; } function setElementSize(id, size){ xoopsGetElementById(id).style.fontSize = size; } function changeDisplay(id){ var elestyle = xoopsGetElementById(id).style; if (elestyle.display == "") { elestyle.display = "none"; } else { elestyle.display = "block"; } } function setVisible(id){ xoopsGetElementById(id).style.visibility = "visible"; } function setHidden(id){ xoopsGetElementById(id).style.visibility = "hidden"; } function xoSwitchStyle( elt, propname, val1, val2 ) { elt.style[propname] = ( !elt.style[propname] || (elt.style[propname]==val1) ) ? val2 : val1; } /* function makeBold( id ) [ return xoSwitchStyle(document.getElementById(id), 'fontWeight', 'normal', 'bold' ); } */ function appendSelectOption(selectMenuId, optionName, optionValue){ var selectMenu = xoopsGetElementById(selectMenuId); var newoption = new Option(optionName, optionValue); selectMenu.options[selectMenu.length] = newoption; selectMenu.options[selectMenu.length].selected = true; } function disableElement(target){ var targetDom = xoopsGetElementById(target); if (targetDom.disabled != true) { targetDom.disabled = true; } else { targetDom.disabled = false; } } function xoopsCheckAll(formname, switchid) { var ele = document.forms[formname].elements; var switch_cbox = xoopsGetElementById(switchid); for (var i = 0; i < ele.length; i++) { var e = ele[i]; if ( (e.name != switch_cbox.name) && (e.type == 'checkbox') ) { e.checked = switch_cbox.checked; } } } function xoopsCheckGroup(formname, switchid, groupid) { var ele = document.forms[formname].elements; var switch_cbox = xoopsGetElementById(switchid); for (var i = 0; i < ele.length; i++) { var e = ele[i]; if ( (e.type == 'checkbox') && (e.id == groupid) ) { e.checked = switch_cbox.checked; e.click(); e.click(); // Click to activate subgroups // Twice so we don't reverse effect } } } function xoopsCheckAllElements(elementIds, switchId) { var switch_cbox = xoopsGetElementById(switchId); for (var i = 0; i < elementIds.length; i++) { var e = xoopsGetElementById(elementIds[i]); if ((e.name != switch_cbox.name) && (e.type == 'checkbox')) { e.checked = switch_cbox.checked; } } } function showImgSelected(imgId, selectId, imgDir, extra, xoopsUrl) { if (xoopsUrl == null) { xoopsUrl = "./"; } imgDom = xoopsGetElementById(imgId); selectDom = xoopsGetElementById(selectId); imgDom.src = xoopsUrl + "/"+ imgDir + "/" + selectDom.options[selectDom.selectedIndex].value + extra; } function xoopsValidate(subjectId, textareaId, submitId, plzCompletePhrase, msgTooLongPhrase, allowedCharPhrase, currCharPhrase) { var maxchars = 65535; var subjectDom = xoopsGetElementById(subjectId); var textareaDom = xoopsGetElementById(textareaId); var submitDom = xoopsGetElementById(submitId); if (textareaDom.value == "" || subjectDom.value == "") { if (plzCompletePhrase == null) { plzCompletePhrase = "Please complete the subject and message fields."; } alert(plzCompletePhrase); return false; } if (maxchars != 0) { if (textareaDom.value.length > maxchars) { if (msgTooLongPhrase == null) { msgTooLongPhrase = "Your message is too long."; } if (allowedCharPhrase == null) { allowedCharPhrase = "Allowed max chars length: "; } if (currCharPhrase == null) { currCharPhrase = "Current chars length: "; } alert(msgTooLongPhrase + "\n\n" + allowedCharPhrase + maxchars + "\n" + currCharPhrase + textareaDom.value.length + ""); textareaDom.focus(); return false; } else { submitDom.disabled = true; return true; } } else { submitDom.disabled = true; return true; } } /* * Cross-browser (DOM + IE) event handling helpers */ function xoAttachEvent(obj, evType, fn, useCapture){ if (obj.addEventListener) { obj.addEventListener(evType, fn, useCapture); return true; } else if (obj.attachEvent) { return obj.attachEvent("on"+evType, fn); } else { return false; } } function xoDetachEvent(obj, evType, fn, useCapture) { if (obj.removeEventListener){ obj.removeEventListener(evType, fn, useCapture); return true; } else if (obj.detachEvent){ return obj.detachEvent("on"+evType, fn); } else { return false; } } Index: theme.css =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/Attic/theme.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** theme.css 31 Oct 2004 14:29:27 -0000 1.1.2.1 --- theme.css 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 2,5 **** --- 2,33 ---- @import url('theme_layout.css'); @import url('theme_blocks.css'); + @import url('theme_forms.css'); + + + + body { + font-family: sans-serif; + } + + img { + border: 0px; + } + + form { + margin: 0px; + } + #content { + padding: 1em 1em 1.5em 1em; + min-height: 256px; + } + #xoops-message { + margin: 3px; + padding: 2px 4px; + border: 1px solid #999999; + background: #eeeeee; + color: #333333; + text-align: center; + font-weight: bold; + } \ No newline at end of file Index: theme_layout.css =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/Attic/theme_layout.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** theme_layout.css 31 Oct 2004 14:29:27 -0000 1.1.2.1 --- theme_layout.css 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 1,54 **** /* $Id$ */ ! html, body { ! height: 100%; ! margin: 0px; } ! body { ! border-left: 6px solid #2F5376; ! background: url('images/page_bg.png') repeat-y left top; } ! .theme_header { ! display: block; ! height: 80px; ! background-color: #2F5376; ! color: #ffffff; } ! .theme_bar { ! display: block; ! color: #000000; ! background: #ffffff url('images/menubar.png') repeat-x left top; ! border-top: 1px solid #cccccc; ! border-bottom: 1px solid #cccccc; ! padding: 2px 1em; ! margin-bottom: .4em; } ! .theme_menubar { font-weight: bold; text-align: right; - margin-left: 166px; } ! .column_left { ! border-top: 1px solid #cccccc; ! float: left; ! width: 166px; } ! .column_center { ! margin-left: 166px; } ! .column_right { ! float: left; ! width: 170px; } ! .theme_footer { ! clear: both; text-align: center; text-transform: lowercase; --- 1,75 ---- /* $Id$ */ ! body { ! margin: 80px 0px 0px 0px; } ! #page-header { ! display: block; position: fixed; ! left: 0px; top: 0px; ! right: 0px; ! z-index: 50; ! } ! .page-header { ! background: url("images/header_bg.png"); ! color: #ffffff; ! height: 80px; ! padding-bottom: 10px; } ! .page-logo { ! display: block; position: absolute; ! left: 0px; top: 0px; ! width: 160px; height: 80px; ! background: url("images/logo.png") no-repeat center center; ! } ! .page-logo span { ! display: none; } ! #page-globalbar { ! text-align: center; } ! #page-menubar { ! position: absolute; ! right: 0px; ! bottom: 10px; font-weight: bold; text-align: right; } ! #page-left_column { ! display: block; position: fixed; ! left: 0px; top: 80px; ! width: 170px; bottom: 0px; ! padding: 0px; ! } ! #page-right_column { ! display: block; position: absolute; ! right: 0px; top: 80px; ! width: 120px; ! padding: 0px; } ! ! #page-left_column + #page-center_column { ! margin-left: 170px; ! } ! #page-right_column + #page-center_column { ! margin-right: 120px; } ! #page-center_column { ! padding: 6px 3px; } ! #page-footer { ! position: fixed; ! left: 0px; bottom: 0px; ! width: 100%; ! background: #2F5376; color: #ffffff; ! padding: 2px 0px; ! font-size: 80%; text-align: center; text-transform: lowercase; Index: theme_block.stytpl =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/Attic/theme_block.stytpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** theme_block.stytpl 31 Oct 2004 14:29:27 -0000 1.1.2.1 --- theme_block.stytpl 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 1,4 **** <div class="block"> ! <div class="blocktitle"><{$me.title}></div> ! <div class="blockcontent"><{$me.content}></div> </div> \ No newline at end of file --- 1,5 ---- <div class="block"> ! <div class="title"><{$me.title}></div> ! <div class="content"><{$me.content}></div> ! <div class="footer"></div> </div> \ No newline at end of file Index: page_default.stytpl =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/Attic/page_default.stytpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** page_default.stytpl 31 Oct 2004 14:29:27 -0000 1.1.2.1 --- page_default.stytpl 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 4,53 **** ><head> <{* $Id$ *}> ! <!-- Xoops default22 theme --> <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" /> <meta http-equiv="content-language" content="<{$xoops_langcode}>" /> <!--XOOPS_DOCUMENT_METAS--> <link rel="stylesheet" type="text/css" media="screen" href="<{resourceUrl /theme.css}>" /> ! <link href="<{resourceUrl /favicon.ico}>" rel="SHORTCUT ICON" /> <{$theme->titleString}> <title><{$xoops_sitename}> - <{$xoops_pagetitle}></title> ! <!-- RMV: added module header --> ! <{$xoops_module_header}> </head> <body> ! <div class="theme_header"> ! <a href="<{$xoops2->services.path->makeUrl('/')}>"><img src="<{resourceUrl /images/logo.png}>" style="width:115px;height:50px;margin:15px 5px" alt="" /></a> ! </div> ! <div class="column_left"> ! <div class="theme_blocks" id="x2blocks_left"> ! <{foreach item=me from=$xoops_lblocks}> ! <{include file="xoops:theme_block"}> ! <{/foreach}> </div> ! </div> ! <div class="theme_menubar theme_bar"> ! Menu bar ! </div> ! <div class="column_center"> ! <div class="theme_blocks" id="x2blocks_above"> ! <{foreach item=block from=$xoops_ccblocks}> ! <{include file="default/theme_blockcenter_c.html"}> ! <{/foreach}> </div> <div id="content"> <{$xoops_contents}> </div> - <{include file="xoops:library/xoops.arch.logger/logger"}> - </div> - <div class="column_right"> - <div class="theme_blocks" id="x2blocks_right"> - <{foreach item=block from=$xoops_rblocks}> - <{include file="default/theme_blockright.html"}> - <{/foreach}> - </div> </div> ! <div class="theme_footer theme_bar" style="display:none"> <a href="http://www.xoops.org/">Powered by XOOPS © 2oo2-2oo4 The XOOPS project.</a> </div> --- 4,50 ---- ><head> <{* $Id$ *}> ! <!-- Xoops default theme --> <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" /> <meta http-equiv="content-language" content="<{$xoops_langcode}>" /> <!--XOOPS_DOCUMENT_METAS--> <link rel="stylesheet" type="text/css" media="screen" href="<{resourceUrl /theme.css}>" /> ! <link href="<{resourceUrl /www/favicon.ico}>" rel="SHORTCUT ICON" /> <{$theme->titleString}> <title><{$xoops_sitename}> - <{$xoops_pagetitle}></title> ! <{$xoops_module_header}> </head> <body> ! ! <div class="page-header" id="page-header"> ! <a class="page-logo" href="<{$xoops2->services.path->makeUrl('/')}>"><span> ! <img src="<{resourceUrl /images/logo.png}>" alt="Xoops" /> ! </span></a> ! <div id="page-globalbar"> ! Navbar to access other subsites goes here </div> ! <div class="theme-blocks" id="page-menubar"> ! Global navigation tools go here </div> + </div> + + <{include file="xoops:theme_blocks_zone" name='left_column' items=$xoops_lblocks}> + <{include file="xoops:theme_blocks_zone" name='right_column' items=$xoops_rblocks}> + + <div id="page-center_column"> + <{if !empty($xoops2->services.hal->redirectMessage)}> + <div id="xoops-message"><{$xoops2->services.hal->redirectMessage}></div> + <{/if}> + <{include file="xoops:theme_blocks_zone" name='center_top_left' items=$xoops_clblocks}> + <{include file="xoops:theme_blocks_zone" name='center_top_right' items=$xoops_crblocks}> + <{include file="xoops:theme_blocks_zone" name='center_top' items=$xoops_ccblocks}> <div id="content"> <{$xoops_contents}> </div> </div> ! ! <div id="page-footer" class="theme_footer theme_bar"> ! <{include file="xoops:library/.xoops.arch.logger/logger"}> <a href="http://www.xoops.org/">Powered by XOOPS © 2oo2-2oo4 The XOOPS project.</a> </div> --- NEW FILE: theme_forms.css --- table.form { width: 100%; } table.form caption { background: #4D628C; color: #FFFFFF; font-weight: bold; text-align: left; padding: 2px 4px; } table.form tbody { background: #eeeeee; color: #000000; } table.form tfoot { background: #f8f8f8; color: #000000; } table.form tbody th { text-align: right; padding: 1px 4px; } .xoFormLabels { width: 25%; } --- NEW FILE: theme_blocks_zone.stytpl --- <{if isset($items) && !empty($items)}> <div class="theme-blocks" id="page-<{$name}>"> <{foreach from=$items item=me}> <{include file="xoops:theme_block"}> <{/foreach}> </div> <{/if}> |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:49:57
|
Update of /cvsroot/xoops/xoops2/themes/default/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19606/themes/default/images Added Files: Tag: xoops2_1_0-branch header_bg.png Log Message: Global update of the default theme. NB: we'll design this one for modern browsers first, then make a Win-IE compatible version once it's finished --- NEW FILE: header_bg.png --- (This appears to be a binary file; contents omitted.) |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:49:57
|
Update of /cvsroot/xoops/xoops2/themes/default/modules/system/blocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19606/themes/default/modules/system/blocks Modified Files: Tag: xoops2_1_0-branch system_block_user.html Log Message: Global update of the default theme. NB: we'll design this one for modern browsers first, then make a Win-IE compatible version once it's finished Index: system_block_user.html =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/modules/system/blocks/Attic/system_block_user.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** system_block_user.html 31 Oct 2004 14:29:26 -0000 1.1.2.1 --- system_block_user.html 31 Oct 2004 23:49:46 -0000 1.1.2.2 *************** *** 1,3 **** ! <ul class="system menu Usermenu"> <li><a href="<{$xoops_url}>/user.php"><{$block.lang_youraccount}></a></li> <li><a href="<{$xoops_url}>/edituser.php"><{$block.lang_editaccount}></a></li> --- 1,3 ---- ! <ul> <li><a href="<{$xoops_url}>/user.php"><{$block.lang_youraccount}></a></li> <li><a href="<{$xoops_url}>/edituser.php"><{$block.lang_editaccount}></a></li> |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:46:22
|
Update of /cvsroot/xoops/xoops2/themes/default/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19134/themes/default/images Modified Files: Tag: xoops2_1_0-branch logo.png Log Message: Made the logo 160x80 Index: logo.png =================================================================== RCS file: /cvsroot/xoops/xoops2/themes/default/images/Attic/logo.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsaLYzHf and /tmp/cvsP9fMP1 differ |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:45:24
|
Update of /cvsroot/xoops/xoops2/modules/system/templates/blocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18989/modules/system/templates/blocks Modified Files: Tag: xoops2_1_0-branch system_block_login.html Log Message: Enhanced the login block output Index: system_block_login.html =================================================================== RCS file: /cvsroot/xoops/xoops2/modules/system/templates/blocks/system_block_login.html,v retrieving revision 1.8 retrieving revision 1.8.16.1 diff -C2 -d -r1.8 -r1.8.16.1 *** system_block_login.html 26 May 2004 14:30:47 -0000 1.8 --- system_block_login.html 31 Oct 2004 23:45:15 -0000 1.8.16.1 *************** *** 1,14 **** ! <form style="margin-top: 0px;" action="<{$xoops_url}>/user.php" method="post"> ! <{$block.lang_username}><br /> ! <input type="text" name="uname" size="12" value="<{$block.unamevalue}>" maxlength="25" /><br /> ! <{$block.lang_password}><br /> ! <input type="password" name="pass" size="12" maxlength="32" /><br /> ! <!-- <input type="checkbox" name="rememberme" value="On" class ="formButton" /><{$block.lang_rememberme}><br /> //--> ! <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" /> <input type="hidden" name="op" value="login" /> ! <input type="submit" value="<{$block.lang_login}>" /><br /> ! <{$block.sslloginlink}> </form> ! <a href="<{$xoops_url}>/user.php#lost"><{$block.lang_lostpass}></a> ! <br /><br /> ! <a href="<{$xoops_url}>/register.php"><{$block.lang_registernow}></a> \ No newline at end of file --- 1,18 ---- ! <form action="<{$xoops2->services.path->makeUrl('/user.php')}>" method="post"> <input type="hidden" name="op" value="login" /> ! <input type="hidden" name="xoops_redirect" value="<{$smarty.server.REQUEST_URI}>" /> ! ! <label for="blk_login_uname"><{$block.lang_username}></label><br /> ! <input type="text" name="uname" value="<{$block.unamevalue}>" id="blk_login_uname" size="12" maxlength="25" /><br /> ! ! <label for="blk_login_pass"><{$block.lang_password}></label><br /> ! <input type="password" name="pass" size="12" maxlength="32" /><br /> ! ! <!-- <input type="checkbox" name="rememberme" value="On" class ="formButton" /><{$block.lang_rememberme}><br /> //--> ! <input type="submit" value="<{$block.lang_login}>" /><br /> ! <{$block.sslloginlink}> </form> ! <p> ! <a href="<{$xoops_url}>/user.php#lost"><{$block.lang_lostpass}></a><br /> ! <a href="<{$xoops_url}>/register.php"><{$block.lang_registernow}></a> ! </p> \ No newline at end of file |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:43:59
|
Update of /cvsroot/xoops/xoops2/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18753/include Modified Files: Tag: xoops2_1_0-branch functions.php Log Message: Removed useless parameter Index: functions.php =================================================================== RCS file: /cvsroot/xoops/xoops2/include/functions.php,v retrieving revision 1.67.10.3 retrieving revision 1.67.10.4 diff -C2 -d -r1.67.10.3 -r1.67.10.4 *** functions.php 13 Oct 2004 20:10:30 -0000 1.67.10.3 --- functions.php 31 Oct 2004 23:43:44 -0000 1.67.10.4 *************** *** 374,378 **** $url = '/' . $url; } ! $xoops2->services['hal']->redirectTo( $url, $message, HTTP_STATUS_SEEOTHER, false ); return; --- 374,378 ---- $url = '/' . $url; } ! $xoops2->services['hal']->redirectTo( $url, $message, HTTP_STATUS_SEEOTHER ); return; |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:42:39
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18561/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/templates Modified Files: Tag: xoops2_1_0-branch form_theme.stytpl Log Message: Small update in generated output Index: form_theme.stytpl =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/templates/Attic/form_theme.stytpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** form_theme.stytpl 19 Oct 2004 17:07:50 -0000 1.1.2.2 --- form_theme.stytpl 31 Oct 2004 23:42:22 -0000 1.1.2.3 *************** *** 1,4 **** <form <{$me->toHtml('attributes')}>> ! <table cellspacing="1"> <{if isset($me->title)}> <caption><{$me->title}></caption><{/if}> <cols><col class='xoFormLabels' /><col class='xoFormFields' /></cols> --- 1,4 ---- <form <{$me->toHtml('attributes')}>> ! <table cellspacing="0" class="form"> <{if isset($me->title)}> <caption><{$me->title}></caption><{/if}> <cols><col class='xoFormLabels' /><col class='xoFormFields' /></cols> |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:41:43
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18154/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca/templates Modified Files: Tag: xoops2_1_0-branch richtext.stytpl Log Message: Metas are now added with the document service Index: richtext.stytpl =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca/templates/Attic/richtext.stytpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** richtext.stytpl 11 Oct 2004 02:33:01 -0000 1.1.2.1 --- richtext.stytpl 31 Oct 2004 23:41:30 -0000 1.1.2.2 *************** *** 1,5 **** ! <style> ! @import url('<{$xoops_url}>/themes/default/library/xoops.form.richtext/richtext.css'); ! </style> <div class="xoFormRichtext" id="rt_<{$me->generateId()}>"> <{assign var="jsme" value=$me->attributes.id}> --- 1,6 ---- ! ! <{document->setMeta type="stylesheet" content="array( 'type' => 'text/css', 'href' => '/www/library/.xoops.form.richtext/richtext.css' )" }> ! <{document->setMeta type="script" content="array( 'type' => 'text/javascript', 'src' => '/www/library/.xoops.form.richtext/richtext.js' )" }> ! <div class="xoFormRichtext" id="rt_<{$me->generateId()}>"> <{assign var="jsme" value=$me->attributes.id}> |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:40:59
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18005/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca Modified Files: Tag: xoops2_1_0-branch richtext.php Log Message: Fixed default template path Index: richtext.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Frameworks/XoopsForm.xofrm/elements/richtext.coca/Attic/richtext.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** richtext.php 11 Oct 2004 02:33:01 -0000 1.1.2.1 --- richtext.php 31 Oct 2004 23:40:50 -0000 1.1.2.2 *************** *** 24,28 **** var $cocaParentId = 'xoops.form.textarea'; var $resourcePath = '.'; ! var $defaultTemplate = 'xoops:library/xoops.form.richtext/templates/richtext.stytpl'; /** --- 24,28 ---- var $cocaParentId = 'xoops.form.textarea'; var $resourcePath = '.'; ! var $defaultTemplate = 'xoops:library/.xoops.form.richtext/templates/richtext.stytpl'; /** |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:39:53
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/Frameworks/XoopsHttpArchitecture.xofrm/hal.coca In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17782/private/lib/Frameworks/XoopsKernel.xofrm/Frameworks/XoopsHttpArchitecture.xofrm/hal.coca Modified Files: Tag: xoops2_1_0-branch hal.php Log Message: Fixing redirectTo(-1) when referer is not here Index: hal.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/Frameworks/XoopsHttpArchitecture.xofrm/hal.coca/Attic/hal.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** hal.php 19 Oct 2004 10:53:11 -0000 1.1.2.2 --- hal.php 31 Oct 2004 23:39:42 -0000 1.1.2.3 *************** *** 108,112 **** function redirectTo( $location, $message = '', $responseCode = 307, $force = false ) { if ( $location === -1 ) { ! $location = $_SERVER['HTTP_REFERER']; } if ( strpos( $location, '://' ) === false ) { --- 108,112 ---- function redirectTo( $location, $message = '', $responseCode = 307, $force = false ) { if ( $location === -1 ) { ! $location = !@empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : (XOOPS_URL . '/'); } if ( strpos( $location, '://' ) === false ) { |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:36:16
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/logger.coca/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17391/private/lib/Frameworks/XoopsKernel.xofrm/logger.coca/templates Modified Files: Tag: xoops2_1_0-branch compact_console.php logger.stytpl Log Message: Some cleaning Index: compact_console.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/logger.coca/templates/Attic/compact_console.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** compact_console.php 19 Oct 2004 10:49:34 -0000 1.1.2.2 --- compact_console.php 31 Oct 2004 23:36:07 -0000 1.1.2.3 *************** *** 1,55 **** <?php // $Id$ ?> ! <div id="xoops-logger" class="compact"> ! <div class="menu-bar" style="display:none"> ! Debug output <a href="<?php echo $xoops2->services['path']->makeUrl('/index2.php?_xo_path=/library/xoops.arch.logger/public/console.php');?>" target="_blank">[ Details ]</a> </div> ! <div class="logger-output"> ! <div id="console-errors" class="miniblock"> ! <div class="blockTitle" >Errors log</div> ! <div class="blockContent" style="font-size:9pt"> ! <table cellspacing="0"> ! <tbody> ! <?php $errorTypes = array( E_WARNING => 'warning', E_NOTICE => 'notice', E_USER_ERROR => 'user_error', E_USER_WARNING => 'user_warning', E_USER_NOTICE => 'user_notice' ); ! $errorNames = array( E_WARNING => 'Warning (PHP)', E_NOTICE => 'Notice (PHP)', E_USER_ERROR => 'Error (XOOPS)', E_USER_WARNING => 'Warning (XOOPS)', E_USER_NOTICE => 'Notice (XOOPS)' ); ! foreach ( $me->events['error'] as $err ) { ?> ! <tr class="entry <?php $this->write($errorTypes[$err['type']]);?>"> ! <td class="message"><?php $this->write($errorNames[$err['type']]);?>: <?php $this->write( $err['description'] );?></td> ! <td title="<?php echo $this->write($err['file']); ?>"> ! <?php echo basename($err['file']); ?> [<?php $this->write( $err['line'] );?>] ! </td> ! </tr> ! <?php } ?> ! </tbody> ! </table> ! </div> ! <div class="blockFooter">Total: <?php $this->write( count($me->events['error']) );?></div> ! </div> ! <div id="console-queries" class="miniblock"> ! <div class="blockTitle" >SQL queries</div> ! <div class="blockContent" style="font-size:9pt"> ! <table cellspacing="0"> ! <tbody> ! <?php foreach ( $me->events['query'] as $qry ) { ?> ! <tr<?php if ( $qry['count']<0 ) { echo ' class="failed"'; } ?>> ! <td title="Count: <?php echo $qry['count']; ?>"><?php echo htmlspecialchars( $qry['sql'] ); ?></td> ! <td title="<?php echo $this->write($qry['trace'][1]['file']); ?>" style="font-size:8pt"><?php echo basename($qry['trace'][1]['file']); ?></td> ! </tr> ! <?php } ?> ! </tbody> ! </table> ! </div> ! <div class="blockFooter">Total: <?php echo count($me->events['query']); ?></div> ! </div> ! <div id="console-objects" class="miniblock"> ! <div class="blockTitle" >Created objects</div> ! <div class="blockContent"> ! ! </div> ! </div> ! <script> ! consoleErrors = new CalcMiniblock( document.getElementById("console-errors") ); ! consoleQueries = new CalcMiniblock( document.getElementById("console-queries") ); ! consoleObjects = new CalcMiniblock( document.getElementById("console-objects") ); ! </script> </div> ! </div> \ No newline at end of file --- 1,66 ---- <?php // $Id$ ?> ! <div id="xoops-logger"> ! <div class="header"> ! <button >Errors (<?php $this->write( count($me->events['error']) );?>)</button> ! <button >SQL Queries (<?php echo count($me->events['query']); ?>)</button> ! <button >Objects</button> ! <!-- ! <a href="<?php echo $xoops2->services['path']->makeUrl('/index2.php?_xo_path=/library/xoops.arch.logger/public/console.php');?>" target="_blank">[ Details ]</a> ! --> </div> ! <div class="logger-output" id="logger-errors"> ! <table cellspacing="0"> ! <tbody> ! <?php $errorTypes = array( E_WARNING => 'warning', E_NOTICE => 'notice', E_USER_ERROR => 'user_error', E_USER_WARNING => 'user_warning', E_USER_NOTICE => 'user_notice' ); ! $errorNames = array( E_WARNING => 'Warning (PHP)', E_NOTICE => 'Notice (PHP)', E_USER_ERROR => 'Error (XOOPS)', E_USER_WARNING => 'Warning (XOOPS)', E_USER_NOTICE => 'Notice (XOOPS)' ); ! foreach ( $me->events['error'] as $err ) { ?> ! <tr class="entry <?php $this->write($errorTypes[$err['type']]);?>"> ! <td class="message"><?php $this->write($errorNames[$err['type']]);?>: <?php $this->write( $err['description'] );?></td> ! <td title="<?php echo $this->write($err['file']); ?>"> ! <?php echo basename($err['file']); ?> [<?php $this->write( $err['line'] );?>] ! </td> ! </tr> ! <?php } ?> ! </tbody> ! </table> </div> ! <div class="logger-output" id="logger-queries"> ! <table cellspacing="0"> ! <tbody> ! <?php foreach ( $me->events['query'] as $qry ) { ?> ! <tr<?php if ( $qry['count']<0 ) { echo ' class="failed"'; } ?>> ! <td title="Count: <?php echo $qry['count']; ?>"><?php echo htmlspecialchars( $qry['sql'] ); ?></td> ! <td title="<?php echo $this->write($qry['trace'][1]['file']); ?>" style="font-size:8pt"><?php echo basename($qry['trace'][1]['file']); ?></td> ! </tr> ! <?php } ?> ! </tbody> ! </table> ! </div> ! </div> ! <script> ! var logger=document.getElementById('xoops-logger'); ! logger.pages = new Array(); ! logger.currentPage='dummy'; ! for (var i=0;i!=logger.childNodes.length;i++) { ! if ( logger.childNodes[i].className == 'logger-output' ) { ! logger.pages[logger.pages.length] = logger.childNodes[i]; ! } ! } ! logger.showPage = function (str) { ! if (str==this.currentPage) { ! return this.showPage(''); ! } else { ! for (var i=0;i!=this.pages.length;i++) { ! this.pages[i].style.display = (this.pages[i].id == ("logger-"+str)) ? "block" : "none"; ! } ! return this.currentPage = str; ! } ! } ! logger.showPage(''); ! var ct=document.getElementById('content'); ! if (ct) { ! var orig=parseInt(ct.style.marginBottom); ! if (!orig) orig=0; ! ct.style.marginBottom = (orig+logger.offsetHeight) + 'px'; ! } ! </script> \ No newline at end of file Index: logger.stytpl =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/logger.coca/templates/Attic/logger.stytpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** logger.stytpl 11 Oct 2004 01:50:47 -0000 1.1.2.1 --- logger.stytpl 31 Oct 2004 23:36:07 -0000 1.1.2.2 *************** *** 1,3 **** <{* $Id$ *}> ! <{document->setMeta type='stylesheet' value="array( 'type' => 'text/css', 'href' => 'library/xoops.arch.logger/public/logger.css')" }> ! <!--XOOPS_DEBUG_OUTPUT--> --- 1,3 ---- <{* $Id$ *}> ! <{document->setMeta type='stylesheet' value="array( 'type' => 'text/css', 'href' => '/www/library/.xoops.arch.logger/logger.css')" }> ! <!--XOOPS_DEBUG_OUTPUT--> \ No newline at end of file |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:35:58
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17288/private/lib/Frameworks/XoopsKernel.xofrm Modified Files: Tag: xoops2_1_0-branch framework_registry.php Log Message: Fixed module instanciation code to allow pages in modules/dirname/admin/ to run Index: framework_registry.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/Attic/framework_registry.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** framework_registry.php 19 Oct 2004 10:39:21 -0000 1.1.2.2 --- framework_registry.php 31 Oct 2004 23:35:43 -0000 1.1.2.3 *************** *** 12,18 **** --- 12,24 ---- 'singleton' => true, ), + 'xoops.coca.module.factory' => array( + 'classPath' => '/module.coca/module.php', + 'className' => 'XoopsModuleFactory', + ), 'xoops.coca.module' => array( 'classPath' => '/module.coca/module.php', 'className' => 'XoopsCocaModule', + 'factoryIdentifier' => 'xoops.coca.module.factory', + 'factoryCapture' => false, ), 'xoops.coca.path_handler' => array( |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:35:21
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/module.coca In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17219/private/lib/Frameworks/XoopsKernel.xofrm/module.coca Modified Files: Tag: xoops2_1_0-branch module.php Log Message: Fixed module instanciation code to allow pages in modules/dirname/admin/ to run Index: module.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/module.coca/Attic/module.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** module.php 11 Oct 2004 01:50:47 -0000 1.1.2.1 --- module.php 31 Oct 2004 23:35:10 -0000 1.1.2.2 *************** *** 1,4 **** --- 1,62 ---- <?php //$Id$ + + + + + class XoopsModuleFactory extends XoopsCocaComponent { + var $cocaId = 'xoops.coca.module.factory'; + + function &create( $desc, $options = array() ) { + global $xoops2; + static $instances; + if ( empty($options['dirname']) || $options['dirname']=='.' ) { + if ( false !== ($mod = strstr( $xoops2->services['hal']->scriptName, '/modules/' ) ) ) { + $options['dirname'] = substr( $mod, 9, strpos( $mod, '/', 9 )-9 ); + } else { + preg_match( '/http:\\/\\/[^\\/]*(.*)/', defined('XOOPS_REAL_URL')?XOOPS_REAL_URL:XOOPS_URL, $match ); + if ( count(explode('/',$match[1]))+1 == count(explode('/',$xoops2->services['hal']->scriptName)) ) { + $options['dirname'] = 'system'; + } + } + } + if ( isset( $instances[ $options['dirname'] ] ) ) { + return $instances[ $options['dirname'] ]; + } + + $module_handler =& xoops_gethandler('module'); + $xoopsModule =& $module_handler->getByDirname( $options['dirname'] ); + if (!$xoopsModule || !$xoopsModule->getVar('isactive')) { + return false; + } + $moduleperm_handler =& xoops_gethandler('groupperm'); + $userGroups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS; + if ( !$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), $userGroups ) ) { + return false; + } + $options['classPath'] = XOOPS_ROOT_PATH . '/modules/' . $options['dirname']; + $options['cocaLangFiles'] = "/modules/{options['dirname']}/main"; + $options['xoopsModule'] =& $xoopsModule; + + $inst =& $xoops2->createWithFactory( $desc, array($options), false ); + $instances[ $options['dirname'] ] =& $inst; + return $inst; + } + + function enumerate() { + $items = array(); + $dh = opendir( 'xoops://modules/' ); + while ( $file = readdir($dh) ) { + if ( $file{0} != '.' ) { + $items[] = $file; + } + } + closedir( $dh ); + return $items; + } + + } + + /** * xoops.coca.module definition *************** *** 24,41 **** * Pointer to corresponding xoopsModule instance kept for compatibility */ ! var $xoopsModule = null; ! ! function &create( $desc, $options = array() ) { ! static $instances; ! $dirname = !@empty($options['dirname']) ? $options['dirname'] : ''; ! if ( isset( $instances[$dirname] ) ) { ! return $instances[$dirname]; ! } ! $inst =& $GLOBALS[XOOPS]->createWithFactory( $desc, $options, false ); ! if ( !empty($dirname) ) { ! $instances[$dirname] =& $inst; ! } ! return $inst; ! } function init( $options = array() ) { --- 82,87 ---- * Pointer to corresponding xoopsModule instance kept for compatibility */ ! var $xoopsModule = false; ! var $xoopsModuleConfig = array(); function init( $options = array() ) { *************** *** 43,76 **** parent::init( $options ); ! if ( !empty($this->dirname) ) { ! if ( $this->dirname == '.' ) { ! if ( file_exists('./xoops_version.php' ) && false !== ($mod = strstr( $xoops2->services['hal']->scriptName, '/modules/' ) ) ) { ! $this->dirname = substr( $mod, 9, strpos( $mod, '/', 9 )-9 ); ! } else { ! preg_match( '/http:\\/\\/[^\\/]*(.*)/', defined('XOOPS_REAL_URL')?XOOPS_REAL_URL:XOOPS_URL, $match ); ! if ( count(explode('/',$match[1]))+1 == count(explode('/',$xoops2->services['hal']->scriptName)) ) { ! $this->dirname = 'system'; ! } ! } ! } ! $module_handler =& xoops_gethandler('module'); ! $xoopsModule =& $module_handler->getByDirname( $this->dirname ); ! if (!$xoopsModule || !$xoopsModule->getVar('isactive')) { ! trigger_error( _MODULENOEXIST, E_USER_WARNING ); ! return false; ! } ! $moduleperm_handler =& xoops_gethandler('groupperm'); ! $userGroups = $GLOBALS['xoopsUser'] ? $GLOBALS['xoopsUser']->getGroups() : XOOPS_GROUP_ANONYMOUS; ! if ( !$moduleperm_handler->checkRight('module_read', $xoopsModule->getVar('mid'), $userGroups ) ) { ! redirect_header(XOOPS_URL."/user.php",1,_NOPERM); ! exit(); ! } ! if ($xoopsModule->getVar('hasconfig') == 1 || $xoopsModule->getVar('hascomments') == 1 || $xoopsModule->getVar( 'hasnotification' ) == 1) { ! $config_handler =& xoops_gethandler('config'); ! $GLOBALS['xoopsModuleConfig'] = $config_handler->getConfigsByCat(0, $xoopsModule->getVar('mid')); ! } ! $this->classPath = XOOPS_ROOT_PATH . '/modules/' . $this->dirname; ! $this->cocaLangFiles = $this->classPath . '/main'; ! $this->xoopsModule =& $xoopsModule; } return true; --- 89,98 ---- parent::init( $options ); ! if ( empty($this->dirname) ) { ! return false; ! } ! if ($this->xoopsModule->getVar('hasconfig') == 1 || $this->xoopsModule->getVar('hascomments') == 1 || $this->xoopsModule->getVar( 'hasnotification' ) == 1) { ! $config_handler =& xoops_gethandler('config'); ! $this->xoopsModuleConfig = $config_handler->getConfigsByCat(0, $this->xoopsModule->getVar('mid')); } return true; |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:34:45
|
Update of /cvsroot/xoops/xoops2/private/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17080/private/etc Modified Files: Tag: xoops2_1_0-branch rc_core.php Log Message: Fixed module instanciation code to allow pages in modules/dirname/admin/ to run Index: rc_core.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/etc/Attic/rc_core.php,v retrieving revision 1.2.8.18 retrieving revision 1.2.8.19 diff -C2 -d -r1.2.8.18 -r1.2.8.19 *** rc_core.php 31 Oct 2004 15:01:41 -0000 1.2.8.18 --- rc_core.php 31 Oct 2004 23:34:36 -0000 1.2.8.19 *************** *** 81,90 **** if ( false === ( $module = $this->create( 'xoops.coca.module', array( 'dirname' => '.' ) ) ) ) { ! include_once XOOPS_ROOT_PATH."/header.php"; ! echo "<h4>"._MODULENOEXIST."</h4>"; ! include_once XOOPS_ROOT_PATH."/footer.php"; ! //exit(); } $GLOBALS['xoopsModule'] =& $module->xoopsModule; if ( $this->runMode & XOOPS_RUN_DEBUG ) { --- 81,89 ---- if ( false === ( $module = $this->create( 'xoops.coca.module', array( 'dirname' => '.' ) ) ) ) { ! $this->services['hal']->redirectTo( -1, _MODULENOEXIST, HTTP_STATUS_NOTFOUND ); ! exit(); } $GLOBALS['xoopsModule'] =& $module->xoopsModule; + $GLOBALS['xoopsModuleConfig'] =& $module->xoopsModuleConfig; if ( $this->runMode & XOOPS_RUN_DEBUG ) { |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:31:58
|
Update of /cvsroot/xoops/xoops2/library/xoops.form.richtext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16364/library/xoops.form.richtext Added Files: Tag: xoops2_1_0-branch richtext.css richtext.js toolbar.css Log Message: Moving the xoops.form.richtext component resource files to /www/library/.xoops.form.richtext/ --- NEW FILE: richtext.css --- @import url('toolbar.css'); .xoFormRichtext .barSmilies { height: 23px; } .xoFormRichtext .barSmilies td { padding: 0px; } .xoFormRichtext .bandSmilies img { width: 17px; height: 17px; padding: 1px 2px; } .bandFormatting button { height: 25px; width: 25px; padding: 0px; } .bandFormatting button span { display: none; } .xoFormRichtext textarea { float: none; clear: both; } .xoFormRichtext .bandSmilies img:hover { background-color: #999999; } .bandFormatting button.bold { background-image: url('images/toolbar/bold.png'); } .bandFormatting button.italic { background-image: url('images/toolbar/italic.png'); } .bandFormatting button.underline { background-image: url('images/toolbar/underline.png'); } .bandFormatting button.linethrough { background-image: url('images/toolbar/linethrough.png'); } --- NEW FILE: richtext.js --- function XoopsFormRichtext( eltid ) { var me=this; this.id = eltid; this.currentSize = this.currentFont = this.currentColor = ""; this.element = document.getElementById("rt_"+eltid); this.sampleDiv = document.getElementById(eltid +"Sample"); this.textarea = document.getElementById(eltid); xoAttachEvent( this.textarea, "select", this.saveEditPos ); xoAttachEvent( this.textarea, "click", this.saveEditPos ); xoAttachEvent( this.textarea, "keyup", this.saveEditPos ); var sel; if (sel=document.getElementById(eltid+"Size")) { var i,vals=['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']; for (i=0;i!=vals.length;i++) { opt=document.createElement("option"); opt.value = opt.innerHTML = vals[i]; sel.appendChild(opt); } sel. Function( "xo_"+eltid+".currentSize=this.value" ); } if (sel=document.getElementById(eltid+"Color")) { var rr,gg,bb, opt, idx=0, cols=["00","33","66","99","CC","FF"]; for (rr=0;rr!=6;rr++) for (gg=0;gg!=6;gg++) for (bb=0;bb!=6;bb++) { opt=document.createElement("option"); opt.value = opt.innerHTML = cols[rr] + cols[gg] + cols[bb]; sel.appendChild(opt); opt.style.backgroundColor=opt.style.color="#"+opt.value; } xoAttachEvent( sel, "change", new Function( "xo_"+eltid+".currentColor=this.value" ) ); } this.codeUrl = function () { if (txt= window.prompt(this.lang._ENTERURL)) { if (txt2=window.prompt(this.lang._ENTERWEBTITLE)) { var pos = txt2.indexOf(unescape('%00')); if(0 < pos) { txt2 = txt2.substr(0,pos); } var res = "[url=" + txt + "]" + txt2 + "[/url]"; } else { var res="[url="+txt+"]"+txt+"[/url]"; } this.insertText(res); } } this.codeEmail = function () { if (text=prompt(this.lang._ENTEREMAIL, "")) { this.insertText("[email]"+text+"[/email]"); } } this.codeImg = function () { var text, text2; if (text=prompt(this.lang._ENTERIMGURL, "")) { text2 = prompt(this.lang._ENTERIMGPOS + "\n" + this.lang._IMGPOSRORL, ""); while ( text2 && ( text2 != "r" ) && ( text2 != "R" ) && ( text2 != "l" ) && ( text2 != "L" ) ) { text2=prompt(this.lang._ERRORIMGPOS + "\n" + this.lang._IMGPOSRORL,""); } if (text2.toLowerCase()=="l") { text2 = " align=left"; } else if (text2.toLowerCase()=="r") { text2 = " align=right"; } else { text2 = ""; } this.insertText("[img"+text2+"]"+text+"[/img]"); } } this.codeCode = function () { if (text = prompt(this.lang._ENTERCODE, "")) { this.insertText("[code]"+text+"[/code]"); } } this.codeQuote = function () { if (text = prompt(this.lang._ENTERQUOTE, "")) { var pos = text.indexOf(unescape('%00')); if(0<pos) { text=text.substr(0,pos); } this.insertText("[quote]"+text+"[/quote]"); } } this.codeSmilie = function (smilieCode) { this.insertText(smilieCode); } this.codeImageManager = function () { openWithSelfMain('/imagemanager.php?target='+this.id, 'imgmanager', 400, 430); } this.makeBold = function () { xoSwitchStyle( this.sampleDiv, "fontWeight", "normal", "bold" ); } this.makeItalic = function () { xoSwitchStyle( this.sampleDiv, "fontStyle", "normal", "italic" ); } this.makeUnderline = function () { xoSwitchStyle( this.sampleDiv, "textDecoration", "none", "underline" ); } this.makeLineThrough = function () { xoSwitchStyle( this.sampleDiv, "textDecoration", "none", "line-through" ); } this.codeText = function () { if (!this.sampleDiv) return; var text=document.getElementById(this.id+"AddText"); if ( text && text.value ) { text=text.value; } else if (!(text=prompt(this.lang._ENTERTEXTBOX))) { return; } var elt; if ( elt=document.getElementById(this.id+"Font") && elt.value ) { text = "[font="+elt.value+"]"+text+"[/font]"; //if(this.autoResetFormatting) elt.options[0].selected=true; } if ( elt=document.getElementById(this.id+"Color") && elt.value ) { text = "[color="+elt.value+"]"+text+"[/color]"; //if(this.autoResetFormatting) elt.options[0].selected=true; } if ( elt=document.getElementById(this.id+"Size") && elt.value ) { text = "[size="+elt.value+"]"+text+"[/size]"; //if(this.autoResetFormatting) elt.options[0].selected=true; } if (this.sampleDiv) { if (this.sampleDiv.style.fontWeight=="bold") { text="[b]"+text+"[/b]" } if (this.sampleDiv.style.fontStyle=="italic") { text="[i]"+text+"[/i]" } if (this.sampleDiv.style.textDecoration=="underline") { text="[u]"+text+"[/u]" } if (this.sampleDiv.style.textDecoration=="line-through") { text="[d]"+text+"[/d]" } } this.insertText(text); } function saveEditPos() { if (this.textarea.createTextRange) { this.textarea.caretPos = document.selection.createRange().duplicate(); } } this.insertText = function (text) { domobj = this.textarea; if (domobj.createTextRange && domobj.caretPos){ var caretPos = domobj.caretPos; caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text; } else if (domobj.getSelection && domobj.caretPos){ var caretPos = domobj.caretPos; caretPos.text = caretPos.text.charat(caretPos.text.length - 1) == ' ' ? text + ' ' : text; } else { domobj.value = domobj.value + text; } } } --- NEW FILE: toolbar.css --- /* Toolbar stuff that should be moved somewhere else */ .xoToolbar { clear: left; float: left; border-top: 1px solid #C1C9D8; border-bottom: 1px solid #7587A8; width: 100%; } .xoToolbar .xoToolband { display: inline; } .xoToolbar table { padding: 1px; } .bandButtons button { display: block; float: left; height: 32px; padding-left: 30px; padding-bottom: 2px; border-style: none; margin: 1px; } .xoToolbar button span { } .xoToolbar button.link { background: url('images/toolbar/link.png') no-repeat left top; } .xoToolbar button.email { background: url('images/toolbar/email.png') no-repeat left top; } .xoToolbar button.image { background: url('images/toolbar/image.png') no-repeat left top; } .xoToolbar button.code { background: url('images/toolbar/code.png') no-repeat left top; } .xoToolbar button.quote { background: url('images/toolbar/quote.png') no-repeat left top; } .xoFormRichtext .xoToolband button { } .xoFormRichtext .xoToolband button:hover { border: 1px solid #000000; border-color: #ffffff #000000 #000000 #ffffff; } |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:31:58
|
Update of /cvsroot/xoops/xoops2/library/xoops.form.richtext/images/toolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16364/library/xoops.form.richtext/images/toolbar Added Files: Tag: xoops2_1_0-branch bold.png code.png email.png image.png imagegallery.png italic.png linethrough.png link.png quote.png underline.png Log Message: Moving the xoops.form.richtext component resource files to /www/library/.xoops.form.richtext/ --- NEW FILE: imagegallery.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: image.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: quote.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bold.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: email.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: code.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: linethrough.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: italic.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: underline.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: link.png --- (This appears to be a binary file; contents omitted.) |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:31:12
|
Update of /cvsroot/xoops/xoops2/library/xoops.arch.logger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16095/library/xoops.arch.logger Modified Files: Tag: xoops2_1_0-branch logger.css Log Message: Some cleaning Index: logger.css =================================================================== RCS file: /cvsroot/xoops/xoops2/library/xoops.arch.logger/Attic/logger.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** logger.css 16 Aug 2004 07:06:08 -0000 1.1.2.1 --- logger.css 31 Oct 2004 23:30:55 -0000 1.1.2.2 *************** *** 3,36 **** /* ------- ------- Default logger view (compact) ------- ------- */ ! #xoops-logger.compact { ! background: #000000; ! color: #eeeeee; ! } ! ! #xoops-logger .menu-bar a { ! color: #ffffaa; } - #xoops-logger h6 { - font: bold 120% sans-serif; - margin: 0px 0px .1em 0px; - padding: .1em; - text-align: center; - background: #333333; } .logger-output { ! font-size: 90%; ! height: 320px; ! max-height: 320px; overflow: auto; } - html > body .logger-output { height: auto; } - - - .logger-output .log { - padding: .3em; - } - .logger-output .entry { --- 3,29 ---- /* ------- ------- Default logger view (compact) ------- ------- */ ! #xoops-logger .header { ! text-align: right; } + #xoops-logger .header button { + border: 1px outset #666666; + margin: 0px; + padding: 2px 4px; + color: #000000; + background: #eeeeee; } + .logger-output { ! font-size: 11pt; ! text-align: left; ! max-height: 200px; overflow: auto; + margin: 2px; + padding: 4px; + background: #000000; + color: #d0d8dc; } .logger-output .entry { |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:29:42
|
Update of /cvsroot/xoops/xoops2/library/xoops.form.richtext/images/toolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15793/toolbar Log Message: Directory /cvsroot/xoops/xoops2/library/xoops.form.richtext/images/toolbar added to the repository --> Using per-directory sticky tag `xoops2_1_0-branch' |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:29:32
|
Update of /cvsroot/xoops/xoops2/library/xoops.form.richtext/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15771/images Log Message: Directory /cvsroot/xoops/xoops2/library/xoops.form.richtext/images added to the repository --> Using per-directory sticky tag `xoops2_1_0-branch' |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:29:23
|
Update of /cvsroot/xoops/xoops2/library/xoops.form.richtext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15724/xoops.form.richtext Log Message: Directory /cvsroot/xoops/xoops2/library/xoops.form.richtext added to the repository --> Using per-directory sticky tag `xoops2_1_0-branch' |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:26:52
|
Update of /cvsroot/xoops/xoops2/themes/default/library/xoops.ui.form.richtext/images/toolbar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15027/themes/default/library/xoops.ui.form.richtext/images/toolbar Removed Files: Tag: xoops2_1_0-branch Thumbs.db bold.png code.png email.png image.png imagegallery.png italic.png linethrough.png link.png quote.png underline.png Log Message: Moving this to /www/library/.xoops.form.richtext/ --- imagegallery.png DELETED --- --- image.png DELETED --- --- quote.png DELETED --- --- code.png DELETED --- --- linethrough.png DELETED --- --- bold.png DELETED --- --- Thumbs.db DELETED --- --- email.png DELETED --- --- italic.png DELETED --- --- underline.png DELETED --- --- link.png DELETED --- |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 23:26:52
|
Update of /cvsroot/xoops/xoops2/themes/default/library/xoops.ui.form.richtext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15027/themes/default/library/xoops.ui.form.richtext Removed Files: Tag: xoops2_1_0-branch richtext.css richtext.js toolbar.css Log Message: Moving this to /www/library/.xoops.form.richtext/ --- richtext.css DELETED --- --- richtext.js DELETED --- --- toolbar.css DELETED --- |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 15:01:50
|
Update of /cvsroot/xoops/xoops2/private/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6345/private/etc Modified Files: Tag: xoops2_1_0-branch rc_core.php Log Message: Ensuring the pagetype language file is loaded correctly Index: rc_core.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/etc/Attic/rc_core.php,v retrieving revision 1.2.8.17 retrieving revision 1.2.8.18 diff -C2 -d -r1.2.8.17 -r1.2.8.18 *** rc_core.php 31 Oct 2004 14:46:56 -0000 1.2.8.17 --- rc_core.php 31 Oct 2004 15:01:41 -0000 1.2.8.18 *************** *** 31,35 **** if ( isset( $GLOBALS['xoopsOption']['pagetype'] ) ) { if ( !strpos( $GLOBALS['xoopsOption']['pagetype'], '..' ) ) { ! $this->services['lang']->loadStrings( '/' . $GLOBALS['xoopsOption']['pagetype'] ); } } --- 31,35 ---- if ( isset( $GLOBALS['xoopsOption']['pagetype'] ) ) { if ( !strpos( $GLOBALS['xoopsOption']['pagetype'], '..' ) ) { ! $this->services['lang']->loadStrings( '/www/' . $GLOBALS['xoopsOption']['pagetype'] ); } } |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 14:56:17
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5311/private/lib/Frameworks/XoopsCore.xofrm Modified Files: Tag: xoops2_1_0-branch framework_registry.php Log Message: Fixed a typo in the XoopsForm framework path Index: framework_registry.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsCore.xofrm/Attic/framework_registry.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** framework_registry.php 11 Oct 2004 02:19:27 -0000 1.1.2.1 --- framework_registry.php 31 Oct 2004 14:56:07 -0000 1.1.2.2 *************** *** 33,37 **** 'xoops.form' => array( 'cocaIsFramework' => true, ! 'classPath' => '/Frameworks/Xoopsform.xofrm/form.php', 'className' => 'Xoops2Form', ), --- 33,37 ---- 'xoops.form' => array( 'cocaIsFramework' => true, ! 'classPath' => '/Frameworks/XoopsForm.xofrm/form.php', 'className' => 'Xoops2Form', ), |
|
From: Skalpa K. <sk...@us...> - 2004-10-31 14:52:12
|
Update of /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4144/private/lib/Frameworks/XoopsKernel.xofrm Modified Files: Tag: xoops2_1_0-branch kernel.php Log Message: Fixing getClassVars() that was unable to get inherited properties default values correctly Index: kernel.php =================================================================== RCS file: /cvsroot/xoops/xoops2/private/lib/Frameworks/XoopsKernel.xofrm/Attic/kernel.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** kernel.php 19 Oct 2004 10:43:53 -0000 1.1.2.2 --- kernel.php 31 Oct 2004 14:51:59 -0000 1.1.2.3 *************** *** 219,223 **** } - /** * Instanciate a component --- 219,222 ---- *************** *** 285,289 **** } $vars = isset($this->defaults[$cid]) ? $this->defaults[$cid] : array(); ! if ( !empty($vars) && $inherited && isset($desc['cocaParentId']) ) { $vars = array_merge( $this->getClassVars( $desc['cocaParentId'], true ), $vars ); } --- 284,288 ---- } $vars = isset($this->defaults[$cid]) ? $this->defaults[$cid] : array(); ! if ( $inherited && isset($desc['cocaParentId']) ) { $vars = array_merge( $this->getClassVars( $desc['cocaParentId'], true ), $vars ); } |