Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
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
(2) |
2
(8) |
3
(7) |
4
(4) |
5
(2) |
6
(5) |
7
(4) |
|
8
(2) |
9
(4) |
10
(34) |
11
(4) |
12
(3) |
13
(5) |
14
(7) |
|
15
(13) |
16
(11) |
17
(2) |
18
(47) |
19
(6) |
20
|
21
(17) |
|
22
(1) |
23
(1) |
24
|
25
|
26
(1) |
27
(1) |
28
(3) |
|
29
|
30
|
31
(1) |
|
|
|
|
|
From: <For...@us...> - 2009-03-31 13:16:06
|
Revision: 3069
http://xoops.svn.sourceforge.net/xoops/?rev=3069&view=rev
Author: ForXoops
Date: 2009-03-31 13:15:46 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Correction of a small bug in main menu steel sheet
Modified Paths:
--------------
XoopsModules/content/trunk/css/mainmenu.css
Modified: XoopsModules/content/trunk/css/mainmenu.css
===================================================================
--- XoopsModules/content/trunk/css/mainmenu.css 2009-03-28 22:55:10 UTC (rev 3068)
+++ XoopsModules/content/trunk/css/mainmenu.css 2009-03-31 13:15:46 UTC (rev 3069)
@@ -11,5 +11,5 @@
padding:1px 1px 1px 8px;
border-left:dashed 1px silver;
border-bottom:dashed 1px silver;
- background-color:#f8f8fe;
+ font-weight:bold;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-03-28 22:55:15
|
Revision: 3068
http://xoops.svn.sourceforge.net/xoops/?rev=3068&view=rev
Author: trabis
Date: 2009-03-28 22:55:10 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Fixing bug #2661850 : Bug on [mp3] tags
Updating player.swf
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/textsanitizer/mp3/mp3.php
XoopsCore/trunk/htdocs/images/form/player.swf
Modified: XoopsCore/trunk/htdocs/class/textsanitizer/mp3/mp3.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/mp3/mp3.php 2009-03-28 22:34:18 UTC (rev 3067)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/mp3/mp3.php 2009-03-28 22:55:10 UTC (rev 3068)
@@ -48,7 +48,7 @@
function load(&$ts)
{
- $ts->patterns[] = "/\[mp3\](.*?)\[\/mp3\]/esU";
+ $ts->patterns[] = "/\[mp3\](.*?)\[\/mp3\]/es";
$ts->replacements[] = __CLASS__ . "::decode( '\\1' )";
return true;
@@ -60,4 +60,4 @@
return $rp;
}
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/trunk/htdocs/images/form/player.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-03-28 22:34:22
|
Revision: 3067
http://xoops.svn.sourceforge.net/xoops/?rev=3067&view=rev
Author: trabis
Date: 2009-03-28 22:34:18 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Fixing bug #2691957 : Images not given in the image manager
Modified Paths:
--------------
XoopsCore/trunk/htdocs/image.php
Modified: XoopsCore/trunk/htdocs/image.php
===================================================================
--- XoopsCore/trunk/htdocs/image.php 2009-03-28 21:02:25 UTC (rev 3066)
+++ XoopsCore/trunk/htdocs/image.php 2009-03-28 22:34:18 UTC (rev 3067)
@@ -32,36 +32,36 @@
$image_id = isset($_GET['id']) ? intval($_GET['id']) : 0;
if (empty($image_id)) {
header('Content-type: image/gif');
- readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
+ readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
exit();
}
$xoopsOption['nocommon'] = 1;
-include './mainfile.php';
-include XOOPS_ROOT_PATH.'/include/functions.php';
-include_once XOOPS_ROOT_PATH.'/class/logger.php';
-include_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
+include dirname(__FILE__) . '/mainfile.php';
+include XOOPS_ROOT_PATH . '/include/functions.php';
+include_once XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php';
+include_once XOOPS_ROOT_PATH . '/class/module.textsanitizer.php';
$xoopsLogger =& XoopsLogger::instance();
$xoopsLogger->startTime();
-include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
+include_once XOOPS_ROOT_PATH . '/class/database/databasefactory.php';
define('XOOPS_DB_PROXY', 1);
$xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection();
// ################# Include class manager file ##############
-require_once XOOPS_ROOT_PATH.'/kernel/object.php';
-require_once XOOPS_ROOT_PATH.'/class/criteria.php';
+require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH . '/class/criteria.php';
$imagehandler =& xoops_gethandler('image');
$criteria = new CriteriaCompo(new Criteria('i.image_display', 1));
$criteria->add(new Criteria('i.image_id', $image_id));
$image = $imagehandler->getObjects($criteria, false, true);
if (count($image) > 0) {
- header('Content-type: '.$image[0]->getVar('image_mimetype'));
+ header('Content-type: ' . $image[0]->getVar('image_mimetype'));
header('Cache-control: max-age=31536000');
- header('Expires: '.gmdate("D, d M Y H:i:s",time()+31536000).'GMT');
- header('Content-disposition: filename='.$image[0]->getVar('image_name'));
- header('Content-Length: '.strlen($image[0]->getVar('image_body')));
- header('Last-Modified: '.gmdate("D, d M Y H:i:s",$image[0]->getVar('image_created')).'GMT');
+ header('Expires: ' . gmdate("D, d M Y H:i:s", time() + 31536000) . 'GMT');
+ header('Content-disposition: filename=' . $image[0]->getVar('image_name'));
+ header('Content-Length: ' . strlen($image[0]->getVar('image_body')));
+ header('Last-Modified: ' . gmdate("D, d M Y H:i:s", $image[0]->getVar('image_created')) . 'GMT');
echo $image[0]->getVar('image_body');
} else {
header('Content-type: image/gif');
- readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
+ readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-03-28 21:02:35
|
Revision: 3066
http://xoops.svn.sourceforge.net/xoops/?rev=3066&view=rev
Author: trabis
Date: 2009-03-28 21:02:25 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
Fix bug : Can not delete notifications. Cache was being used and Token validation was failing.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/header.php
XoopsCore/trunk/htdocs/modules/system/templates/system_notification_list.html
Modified: XoopsCore/trunk/htdocs/header.php
===================================================================
--- XoopsCore/trunk/htdocs/header.php 2009-03-27 17:02:51 UTC (rev 3065)
+++ XoopsCore/trunk/htdocs/header.php 2009-03-28 21:02:25 UTC (rev 3066)
@@ -98,7 +98,7 @@
if ( !empty($xoopsModule) ) {
$xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][ $xoopsModule->getVar('mid', 'n') ];
// Tricky solution for setting cache time for homepage
- } elseif (!empty($xoopsOption['template_main'])) {
+ } elseif (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') {
$xoTheme->contentCacheLifetime = 604800;
}
if ( $xoTheme->checkCache() ) {
@@ -119,4 +119,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: XoopsCore/trunk/htdocs/modules/system/templates/system_notification_list.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/system_notification_list.html 2009-03-27 17:02:51 UTC (rev 3065)
+++ XoopsCore/trunk/htdocs/modules/system/templates/system_notification_list.html 2009-03-28 21:02:25 UTC (rev 3066)
@@ -18,7 +18,7 @@
<{foreach item=notification from=$item.notifications}>
<tr>
<{cycle values=odd,even assign=class}>
- <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>][]" value="<{$notification.id}>" /></td>
+ <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>]" value="<{$notification.id}>" /></td>
<td class="<{$class}>"><{$notification.event_title}></td>
<td class="<{$class}>"><{$notification.category_title}></td>
<td class="<{$class}>"><{if $item.id != 0}><{$item.id}><{/if}></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-03-27 17:03:04
|
Revision: 3065
http://xoops.svn.sourceforge.net/xoops/?rev=3065&view=rev
Author: anderssk
Date: 2009-03-27 17:02:51 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Xdonations upload
Added Paths:
-----------
XoopsLanguages/danish/modules/xdonations/
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/admin.php
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/blocks.php
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/index.html
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/main.php
XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/modinfo.php
Added: XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/admin.php
===================================================================
--- XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/admin.php (rev 0)
+++ XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/admin.php 2009-03-27 17:02:51 UTC (rev 3065)
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************/
+/* Donations - Paypal financial management module for Xoops 2 */
+/* Copyright (c) 2004 by Xoops2 Donations Module Dev Team */
+/* http://dev.xoops.org/modules/xfmod/project/?group_id=1060 */
+/* $Id: admin.php,v 1.4 2004/10/15 17:58:57 blackdeath_csmc Exp $ */
+/************************************************************************/
+/* */
+/* Based on NukeTreasury for PHP-Nuke - by Dave Lawrence AKA Thrash */
+/* NukeTreasury - Financial management for PHP-Nuke */
+/* Copyright (c) 2004 by Dave Lawrence AKA Thrash */
+/* th...@fr... */
+/* thr...@ho... */
+/* */
+/************************************************************************/
+/* */
+/* This program is free software; you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation; either version 2 of the License. */
+/* */
+/* This program is distributed in the hope that it will be useful, but */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */
+/* General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program; if not, write to the Free Software */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
+/* USA */
+/************************************************************************/
+
+### ADMIN DEFINITIONS ###
+define('_DM_TREASURY_F_REGISTER','Treasury Financial Register');
+define('_DM_TREASURY_ADMIN','Treasury Administration');
+
+?>
\ No newline at end of file
Added: XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/blocks.php
===================================================================
--- XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/blocks.php (rev 0)
+++ XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/blocks.php 2009-03-27 17:02:51 UTC (rev 3065)
@@ -0,0 +1,57 @@
+<?php
+/************************************************************************/
+/* Donations - Paypal financial management module for Xoops 2 */
+/* Copyright (c) 2004 by Xoops2 Donations Module Dev Team */
+/* http://dev.xoops.org/modules/xfmod/project/?group_id=1060 */
+/* $Id: blocks.php,v 1.9 2004/10/15 17:58:57 blackdeath_csmc Exp $ */
+/************************************************************************/
+/* */
+/* Based on NukeTreasury for PHP-Nuke - by Dave Lawrence AKA Thrash */
+/* NukeTreasury - Financial management for PHP-Nuke */
+/* Copyright (c) 2004 by Dave Lawrence AKA Thrash */
+/* th...@fr... */
+/* thr...@ho... */
+/* */
+/************************************************************************/
+/* */
+/* This program is free software; you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation; either version 2 of the License. */
+/* */
+/* This program is distributed in the hope that it will be useful, but */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */
+/* General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program; if not, write to the Free Software */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
+/* USA */
+/************************************************************************/
+
+// Blocks
+
+### DONAT-O-METER BLOCK DEFINITIONS ###
+define('_DMB_STAT','Statistik');
+define('_DMB_MONGOAL','%s\'s mål');
+define('_DMB_DUEDATE','Forfaldsdato');
+define('_DMB_GROSSAMT','Bruttobeløb');
+define('_DMB_NETBAL','Nettosaldo');
+define('_DMB_LEFT2GO','Tilbage');
+define('_DMB_DONATIONS','Donationer');
+define('_DMB_MAKEDON','Send donation med PayPal!');
+define('_DMB_SURPLUS','Overskud');
+
+### DONATE NOW BLOCK DEFINITIONS ###
+// why do i have to duplicate from main.php?
+define('_DMB_SELECTAMT','Vælg venligst et beløb at donere');
+define('_DMB_SUBMIT_BUTTON','Send donation');
+define('_DMB_DON_OTHER','Andet');
+
+### DONOR LIST BLOCK DEFINITIONS ###
+define("_DMB_NAME","Navn");
+define("_DMB_AMOUNT","Beløb");
+define("_DMB_DATE","Dato");
+define('_DMB_ANONYMOUS_SHORT','Anonym');
+
+?>
\ No newline at end of file
Added: XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/index.html
===================================================================
--- XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/index.html (rev 0)
+++ XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/index.html 2009-03-27 17:02:51 UTC (rev 3065)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/main.php
===================================================================
--- XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/main.php (rev 0)
+++ XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/main.php 2009-03-27 17:02:51 UTC (rev 3065)
@@ -0,0 +1,73 @@
+<?php
+/************************************************************************/
+/* Donations - Paypal financial management module for Xoops 2 */
+/* Copyright (c) 2004 by Xoops2 Donations Module Dev Team */
+/* http://dev.xoops.org/modules/xfmod/project/?group_id=1060 */
+/* $Id: main.php,v 1.4 2004/10/15 17:58:57 blackdeath_csmc Exp $ */
+/************************************************************************/
+/* */
+/* Based on NukeTreasury for PHP-Nuke - by Dave Lawrence AKA Thrash */
+/* NukeTreasury - Financial management for PHP-Nuke */
+/* Copyright (c) 2004 by Dave Lawrence AKA Thrash */
+/* th...@fr... */
+/* thr...@ho... */
+/* */
+/************************************************************************/
+/* */
+/* This program is free software; you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation; either version 2 of the License. */
+/* */
+/* This program is distributed in the hope that it will be useful, but */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */
+/* General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program; if not, write to the Free Software */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
+/* USA */
+/************************************************************************/
+
+### CURRENCY SYMBOL DEFINITIONS ###
+define('_DM_CURR_EUR','€'); //euro
+define('_DM_CURR_USD','$'); //us dollar
+define('_DM_CURR_GBP','£'); //britain pound
+define('_DM_CURR_JPY','¥'); //japanese yen
+define('_DM_CURR_CAD','C$'); //canadian dollar
+define('_DM_CURR_DKR','DKR;');//Danske kroner
+
+### IPN DEBUG DEFINITIONS ###
+define('_DM_DEBUGACTIVE','Debug mode aktiveret');
+define('_DM_DEBUGHEADER','<br>Xoops Donations Module<br><br>PayPal Instant Payment Notification script<br><br>Se herunder for status:<hr>');
+define('_DM_OPENCONN','Åbner forbindelse og efterprøver forespørgsel hos PayPal...');
+define('_DM_CONNFAIL','forbindelse til PayPal MISLYKKEDES');
+define('_DM_RCVINVALID','Ugyldig modtager e-mail: %s , afbryder...');
+define('_DM_VERIFIED','PayPal bekræftet');
+define('_DM_REFUND','Transaktionen er en tilbagebetaling');
+define('_DM_TRANSMISSING','IPN FEJL: Modtaget betaling, men mangler forudgående transaktion ');
+define('_DM_MULTITXNS','IPN FEJL: Modtaget betaling, men flere forudgående txn_id\'s fundet, afbryder');
+define('_DM_DUPLICATETXN','Ugyldig IPN, men GENTAGENDE txn_id! afbryder...');
+define('_DM_NOTINTERESTED','Gyldig IPN, men er ikke interesseret i denne transaktion');
+define('_DM_INVALIDIPN','Ugyldig IPN transaktion, dette er en unormalt');
+define('_DM_DEBUGPASS','UDFØRT!');
+define('_DM_DEBUGFAIL','FEJL!');
+define('_DM_RCVEMAIL','PayPal modtager e-mail: %s');
+define('_DM_LOGBEGIN','Log begivenheder');
+define('_DM_IFNOERROR','Hvis du ikke ser nogle fejl-meddelelser, skulle du være klar!');
+
+### INDEX.PHP PAGE DEFINITIONS ###
+define('_DM_TITLE','Vi behøver din hjælp - Giv en Donation!');
+define('_DM_MAKEADON','Giv en Donation');
+define('_DM_SELECTAMT','Vælg venligst et beløb at donere');
+define('_DM_SHOWNAME','Skal dit navn vises på listen over donorer?');
+define('_DM_DONTHISMONTH','Denne måneds gavmilde givere....');
+define('_DM_DON_NAME','Navn');
+define('_DM_DON_AMT','Beløb');
+define('_DM_DON_DATE','Dato');
+define('_DM_ANONYMOUS','Anonym Donor');
+define('_DM_ANONYMOUS_SHORT','Anonym');
+define('_DM_DON_OTHER','Andet');
+define('_DM_SUBMIT_BUTTON','Send Donation >>');
+
+?>
Added: XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/modinfo.php
===================================================================
--- XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/modinfo.php (rev 0)
+++ XoopsLanguages/danish/modules/xdonations/xdonations 1.9/language/danish/modinfo.php 2009-03-27 17:02:51 UTC (rev 3065)
@@ -0,0 +1,47 @@
+<?php
+/************************************************************************/
+/* Donations - Paypal financial management module for Xoops 2 */
+/* Copyright (c) 2004 by Xoops2 Donations Module Dev Team */
+/* http://dev.xoops.org/modules/xfmod/project/?group_id=1060 */
+/* $Id: modinfo.php,v 1.3 2004/10/15 17:58:57 blackdeath_csmc Exp $ */
+/************************************************************************/
+/* */
+/* Based on NukeTreasury for PHP-Nuke - by Dave Lawrence AKA Thrash */
+/* NukeTreasury - Financial management for PHP-Nuke */
+/* Copyright (c) 2004 by Dave Lawrence AKA Thrash */
+/* th...@fr... */
+/* thr...@ho... */
+/* */
+/************************************************************************/
+/* */
+/* This program is free software; you can redistribute it and/or modify */
+/* it under the terms of the GNU General Public License as published by */
+/* the Free Software Foundation; either version 2 of the License. */
+/* */
+/* This program is distributed in the hope that it will be useful, but */
+/* WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */
+/* General Public License for more details. */
+/* */
+/* You should have received a copy of the GNU General Public License */
+/* along with this program; if not, write to the Free Software */
+/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 */
+/* USA */
+/************************************************************************/
+
+// Module Info
+
+define("_MI_DM_NAME","Donationer");
+
+// A brief description of this module
+define("_MI_DM_DESC","Paypal financial management module for XOOPS2");
+
+// Names of blocks for this module (Not all module has blocks)
+define("_MI_DM_BNAME1","Donat-O-Meter");
+define("_MI_DM_BNAME1_DESC","Grafisk visning af donationer");
+define("_MI_DM_BNAME2","Giv en donation!");
+define("_MI_DM_BNAME2_DESC","Tillad dine brugeren at donere til din side med Paypal");
+define("_MI_DM_BNAME3","Tidligere Donorer");
+define("_MI_DM_BNAME3_DESC","En liste over tidligere donorer");
+define("_MI_DM_BUTTON_URL","https://www.paypal.com/en_US/i/btn/x-click-but21.gif");
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tr...@us...> - 2009-03-26 21:32:02
|
Revision: 3064
http://xoops.svn.sourceforge.net/xoops/?rev=3064&view=rev
Author: trabis
Date: 2009-03-26 21:31:59 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
Fixed bug #2624953: Can't save value of DATE and LONGDATE in profile module
Modified Paths:
--------------
XoopsCore/trunk/htdocs/modules/profile/register.php
Modified: XoopsCore/trunk/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/register.php 2009-03-22 01:36:03 UTC (rev 3063)
+++ XoopsCore/trunk/htdocs/modules/profile/register.php 2009-03-26 21:31:59 UTC (rev 3064)
@@ -100,10 +100,11 @@
*/
foreach (array_keys($fields) as $field) {
if (!isset($_POST[$field])) continue;
+ $value = $fields[$field]->getValueForSave($_POST[$field]);
if (in_array($field, $userfields)) {
- $newuser->setVar($field, $_POST[$field]);
+ $newuser->setVar($field, $value);
} else {
- $profile->setVar($field, $_POST[$field]);
+ $profile->setVar($field, $value);
}
}
// Check user data at first step
@@ -249,4 +250,4 @@
*/
include 'footer.php';
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2009-03-22 01:57:07
|
Revision: 3063
http://xoops.svn.sourceforge.net/xoops/?rev=3063&view=rev
Author: wishcraft
Date: 2009-03-22 01:36:03 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
1.17 - Multisite Module for XOOPS 2.3.x
Modified Paths:
--------------
XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/preferences/main.php
XoopsModules/multisite/trunk/modules/multisite/post.load.php
XoopsModules/multisite/trunk/modules/multisite/templates/multisite_atom.html
Added Paths:
-----------
XoopsModules/multisite/releases/1.17/
XoopsModules/multisite/releases/1.17/admin/
XoopsModules/multisite/releases/1.17/admin/blocksadmin/
XoopsModules/multisite/releases/1.17/admin/blocksadmin/blockform.php
XoopsModules/multisite/releases/1.17/admin/blocksadmin/blocksadmin.php
XoopsModules/multisite/releases/1.17/admin/blocksadmin/index.html
XoopsModules/multisite/releases/1.17/admin/blocksadmin/main.php
XoopsModules/multisite/releases/1.17/admin/blocksadmin/xoops_version.php
XoopsModules/multisite/releases/1.17/admin/domainsadmin/
XoopsModules/multisite/releases/1.17/admin/domainsadmin/domainsadmin.php
XoopsModules/multisite/releases/1.17/admin/domainsadmin/index.html
XoopsModules/multisite/releases/1.17/admin/domainsadmin/main.php
XoopsModules/multisite/releases/1.17/admin/domainsadmin/xoops_version.php
XoopsModules/multisite/releases/1.17/admin/groupperm.php
XoopsModules/multisite/releases/1.17/admin/index.html
XoopsModules/multisite/releases/1.17/admin/menu.php
XoopsModules/multisite/releases/1.17/admin/modulesadmin/
XoopsModules/multisite/releases/1.17/admin/modulesadmin/index.html
XoopsModules/multisite/releases/1.17/admin/modulesadmin/main.php
XoopsModules/multisite/releases/1.17/admin/modulesadmin/modulesadmin.php
XoopsModules/multisite/releases/1.17/admin/modulesadmin/xoops_version.php
XoopsModules/multisite/releases/1.17/admin/policiesadmin/
XoopsModules/multisite/releases/1.17/admin/policiesadmin/index.html
XoopsModules/multisite/releases/1.17/admin/policiesadmin/main.php
XoopsModules/multisite/releases/1.17/admin/policiesadmin/policiesadmin.php
XoopsModules/multisite/releases/1.17/admin/policiesadmin/xoops_version.php
XoopsModules/multisite/releases/1.17/admin/preferences/
XoopsModules/multisite/releases/1.17/admin/preferences/index.html
XoopsModules/multisite/releases/1.17/admin/preferences/main.php
XoopsModules/multisite/releases/1.17/admin/preferences/xoops_version.php
XoopsModules/multisite/releases/1.17/admin/version/
XoopsModules/multisite/releases/1.17/admin/version/index.html
XoopsModules/multisite/releases/1.17/admin/version/main.php
XoopsModules/multisite/releases/1.17/admin/version/s_poweredby.gif
XoopsModules/multisite/releases/1.17/admin/version/xoops_version.php
XoopsModules/multisite/releases/1.17/admin.php
XoopsModules/multisite/releases/1.17/blocks/
XoopsModules/multisite/releases/1.17/blocks/index.html
XoopsModules/multisite/releases/1.17/blocks/multisite_blocks.php
XoopsModules/multisite/releases/1.17/class/
XoopsModules/multisite/releases/1.17/class/block.php
XoopsModules/multisite/releases/1.17/class/domain.php
XoopsModules/multisite/releases/1.17/class/domaincategory.php
XoopsModules/multisite/releases/1.17/class/domainitem.php
XoopsModules/multisite/releases/1.17/class/domainoption.php
XoopsModules/multisite/releases/1.17/class/feeds.php
XoopsModules/multisite/releases/1.17/class/formselectdomains.php
XoopsModules/multisite/releases/1.17/class/mailer.php
XoopsModules/multisite/releases/1.17/class/module.php
XoopsModules/multisite/releases/1.17/class/multimailer.php
XoopsModules/multisite/releases/1.17/class/policy.php
XoopsModules/multisite/releases/1.17/constants.php
XoopsModules/multisite/releases/1.17/images/
XoopsModules/multisite/releases/1.17/images/Thumbs.db
XoopsModules/multisite/releases/1.17/images/bg_content.gif
XoopsModules/multisite/releases/1.17/images/bg_menu.gif
XoopsModules/multisite/releases/1.17/images/check.gif
XoopsModules/multisite/releases/1.17/images/delete.png
XoopsModules/multisite/releases/1.17/images/edit.png
XoopsModules/multisite/releases/1.17/images/hbar_left.gif
XoopsModules/multisite/releases/1.17/images/hbar_middle.gif
XoopsModules/multisite/releases/1.17/images/hbar_right.gif
XoopsModules/multisite/releases/1.17/images/index.html
XoopsModules/multisite/releases/1.17/images/info.gif
XoopsModules/multisite/releases/1.17/images/install.gif
XoopsModules/multisite/releases/1.17/images/left_both.gif
XoopsModules/multisite/releases/1.17/images/logo.gif
XoopsModules/multisite/releases/1.17/images/menu.gif
XoopsModules/multisite/releases/1.17/images/multisite_slogo.gif
XoopsModules/multisite/releases/1.17/images/powered_by_xoops.gif
XoopsModules/multisite/releases/1.17/images/right_both.gif
XoopsModules/multisite/releases/1.17/images/uninstall.gif
XoopsModules/multisite/releases/1.17/images/update.gif
XoopsModules/multisite/releases/1.17/images/xoops2.gif
XoopsModules/multisite/releases/1.17/include/
XoopsModules/multisite/releases/1.17/include/functions.php
XoopsModules/multisite/releases/1.17/include/index.html
XoopsModules/multisite/releases/1.17/include/install.php
XoopsModules/multisite/releases/1.17/include/uninstall.php
XoopsModules/multisite/releases/1.17/include/update.php
XoopsModules/multisite/releases/1.17/index.html
XoopsModules/multisite/releases/1.17/language/
XoopsModules/multisite/releases/1.17/language/english/
XoopsModules/multisite/releases/1.17/language/english/admin/
XoopsModules/multisite/releases/1.17/language/english/admin/blocksadmin.php
XoopsModules/multisite/releases/1.17/language/english/admin/comments.php
XoopsModules/multisite/releases/1.17/language/english/admin/domainsadmin.php
XoopsModules/multisite/releases/1.17/language/english/admin/index.html
XoopsModules/multisite/releases/1.17/language/english/admin/modulesadmin.php
XoopsModules/multisite/releases/1.17/language/english/admin/policiesadmin.php
XoopsModules/multisite/releases/1.17/language/english/admin/preferences.php
XoopsModules/multisite/releases/1.17/language/english/admin/version.php
XoopsModules/multisite/releases/1.17/language/english/admin.php
XoopsModules/multisite/releases/1.17/language/english/blocks.php
XoopsModules/multisite/releases/1.17/language/english/cpanel.php
XoopsModules/multisite/releases/1.17/language/english/index.html
XoopsModules/multisite/releases/1.17/language/english/modinfo.php
XoopsModules/multisite/releases/1.17/language/index.html
XoopsModules/multisite/releases/1.17/menu.php
XoopsModules/multisite/releases/1.17/post.load.php
XoopsModules/multisite/releases/1.17/pre.load.php
XoopsModules/multisite/releases/1.17/sql/
XoopsModules/multisite/releases/1.17/sql/multisite.sql
XoopsModules/multisite/releases/1.17/sql/multisite.sql.bak
XoopsModules/multisite/releases/1.17/style.css
XoopsModules/multisite/releases/1.17/templates/
XoopsModules/multisite/releases/1.17/templates/blocks/
XoopsModules/multisite/releases/1.17/templates/blocks/index.html
XoopsModules/multisite/releases/1.17/templates/blocks/multisite_block_mainmenu.html
XoopsModules/multisite/releases/1.17/templates/index.html
XoopsModules/multisite/releases/1.17/templates/multisite_atom.html
XoopsModules/multisite/releases/1.17/templates/multisite_rss.html
XoopsModules/multisite/releases/1.17/templates/multisite_sitemap.html
XoopsModules/multisite/releases/1.17/xoops_version.php
XoopsModules/multisite/trunk/modules/multisite/class/mailer.php
XoopsModules/multisite/trunk/modules/multisite/class/multimailer.php
Added: XoopsModules/multisite/releases/1.17/admin/blocksadmin/blockform.php
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/blocksadmin/blockform.php (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/blocksadmin/blockform.php 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1,109 @@
+<?php
+// $Id: blockform.php 1993 2008-08-30 10:49:06Z phppp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+$form = new XoopsThemeForm($block['form_title'], 'blockform', 'admin.php', "post", true);
+if (isset($block['name'])) {
+ $form->addElement(new XoopsFormLabel(_AM_NAME, $block['name']));
+}
+$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
+$side_select->addOptionArray(array(0 => _AM_SBLEFT, 1 => _AM_SBRIGHT, 3 => _AM_CBLEFT, 4 => _AM_CBRIGHT, 5 => _AM_CBCENTER, 7 => _AM_CBBOTTOMLEFT, 8 => _AM_CBBOTTOMRIGHT, 9 => _AM_CBBOTTOM, ));
+$form->addElement($side_select);
+$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight']));
+$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible']));
+$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, true);
+$module_handler =& xoops_getmodulehandler('module','multisite');
+$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+$criteria->add(new Criteria('isactive', 1));
+$module_list = $module_handler->getList($criteria);
+$module_list[-1] = _AM_TOPPAGE;
+$module_list[0] = _AM_ALLPAGES;
+ksort($module_list);
+$mod_select->addOptionArray($module_list);
+$form->addElement($mod_select);
+
+$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
+if ( $block['is_custom'] ) {
+ $textarea = new XoopsFormDhtmlTextArea(_AM_CONTENT, 'bcontent', $block['content'], 15, 70);
+ $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'._AM_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
+ $textarea->doHtml = true;
+ $form->addElement($textarea, true);
+ $ctype_select = new XoopsFormSelect(_AM_CTYPE, 'bctype', $block['ctype']);
+ $ctype_select->addOptionArray(array('H' => _AM_HTML, 'P' => _AM_PHP, 'S' => _AM_AFWSMILE, 'T' => _AM_AFNOSMILE));
+ $form->addElement($ctype_select);
+} else {
+ if ($block['template'] != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
+ if (count($btemplate) > 0) {
+ $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="'.XOOPS_URL.'/modules/multisite/admin.php?fct=tplsets&op=edittpl&id='.$btemplate[0]->getVar('tpl_id').'">'._AM_EDITTPL.'</a>'));
+ } else {
+ $btemplate2 = $tplfile_handler->find('default', 'block', $block['bid']);
+ if (count($btemplate2) > 0) {
+ $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="'.XOOPS_URL.'/modules/multisite/admin.php?fct=tplsets&op=edittpl&id='.$btemplate2[0]->getVar('tpl_id').'" rel="external">'._AM_EDITTPL.'</a>'));
+ }
+ }
+ }
+ if ($block['edit_form'] != false) {
+ $form->addElement(new XoopsFormLabel(_AM_OPTIONS, $block['edit_form']));
+ }
+}
+
+
+$domain_select = new XoopsFormSelect(_AM_DOMAINSIN, "domains", explode('|',$block['domains']), 5, true);
+$module_handler =& xoops_getmodulehandler('module','multisite');
+$module =& $module_handler->getByDirname('multisite');
+$domain_handler =& xoops_getmodulehandler('domain', 'multisite');
+
+$critera_z = new CriteriaCompo(new Criteria('dom_modid', $module->getVar('mid')));
+$critera_z->add(new Criteria('dom_catid', XOOPS_DOMAIN)) ;
+$critera_z->add(new Criteria('dom_name', 'domain')) ;
+$domains = $domain_handler->getDomains($critera_z);
+
+$domain_list['all'] = _AM_ALLDOMAINS;
+foreach($domains as $domain)
+ $domain_list[$domain->getVar('dom_value')] = $domain->getVar('dom_value');
+
+$domain_select->addOptionArray($domain_list);
+$form->addElement($domain_select);
+
+
+$cache_select = new XoopsFormSelect(_AM_BCACHETIME, 'bcachetime', $block['cachetime']);
+$cache_select->addOptionArray(array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH));
+$form->addElement($cache_select);
+if (isset($block['bid'])) {
+ $form->addElement(new XoopsFormHidden('bid', $block['bid']));
+}
+$form->addElement(new XoopsFormHidden('op', $block['op']));
+$form->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
+$button_tray = new XoopsFormElementTray('', ' ');
+if ($block['is_custom']) {
+ $button_tray->addElement(new XoopsFormButton('', 'previewblock', _PREVIEW, "submit"));
+}
+$button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, "submit"));
+$form->addElement($button_tray);
+?>
Added: XoopsModules/multisite/releases/1.17/admin/blocksadmin/blocksadmin.php
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/blocksadmin/blocksadmin.php (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/blocksadmin/blocksadmin.php 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1,662 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS Block management
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package kernel
+ * @since 2.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author Steven Li <ph...@us...>
+ * @version $Id: blocksadmin.php 2879 2009-02-27 00:53:34Z wishcraft $
+ * @package class
+ * @todo zone evolution
+ */
+
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ exit("Access Denied");
+}
+
+include_once XOOPS_ROOT_PATH.'/modules/multisite/class/block.php';
+
+function list_blocks()
+{
+ global $xoopsUser, $xoopsConfig, $xoopsDB;
+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+
+ $module_handler =& xoops_getmodulehandler('module','multisite');
+ $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+ $criteria->add(new Criteria('isactive', 1));
+ // Modules for blocks to be visible in
+ $display_list = $module_handler->getList($criteria);
+ unset($criteria);
+ // Modules generating the blocks
+ $generator_list = $module_handler->getList();
+ // for custom blocks
+ $generator_list[0] = _AM_CUSTOM;
+
+ $module_handler =& xoops_getmodulehandler('module','multisite');
+ $module =& $module_handler->getByDirname('multisite');
+ $domains_handler =& xoops_getmodulehandler('domain', 'multisite');
+
+ $critera_z = new CriteriaCompo(new Criteria('dom_catid', XOOPS_DOMAIN));
+ $critera_z->add(new Criteria('dom_name', 'domain')) ;
+ $domains = $domains_handler->getDomains($critera_z);
+
+ $domain_list['all'] = _AM_ALLDOMAINS;
+ foreach($domains as $domain)
+ $domain_list[$domain->getVar('dom_value')] = $domain->getVar('dom_value');
+
+ $selmod = isset($_GET['selmod']) ? intval($_GET['selmod']) : -1;
+ $selgen = isset($_GET['selgen']) ? intval($_GET['selgen']) : 1;
+ $selvis = isset($_GET['selvis']) ? intval($_GET['selvis']) : -1;
+ $selgrp = isset($_GET['selgrp']) ? intval($_GET['selgrp']) : XOOPS_GROUP_USERS;
+ $seldom = isset($_GET['seldom']) ? intval($_GET['seldom']) : 'all';
+
+ echo "<h4>"._AM_BADMIN."</h4>";
+
+ // For selection of generated by
+ echo '<form action="admin.php" method="get">';
+ $form = "<select size=\"1\" name=\"selgen\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selmod=$selmod&selvis=$selvis&selgrp=$selgrp&selgen='+this.options[this.selectedIndex].value\">";
+ $generator_list[-1] = _AM_TYPES;
+ ksort($generator_list);
+ foreach ($generator_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $selgen ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> ';
+ printf(_AM_GENERATOR, $form);
+
+ // For selection of visible in
+ $form = "<select size=\"1\" name=\"seldom\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selvis=$selvis&selgrp=$selgrp&selmod=$selmod&seldom='+this.options[this.selectedIndex].value\">";
+ //$toponlyblock = false;
+ foreach ($domain_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $seldom ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> '; // <input type="hidden" name="fct" value="blocksadmin" />';
+ printf(_AM_DOMAINSINSEL, $form);
+
+ // For selection of visible in
+ $form = "<select size=\"1\" name=\"selmod\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&seldom=$seldom&selvis=$selvis&selgrp=$selgrp&selmod='+this.options[this.selectedIndex].value\">";
+ //$toponlyblock = false;
+ ksort($display_list);
+ $display_list_spec[-2] = _AM_TYPES;
+ $display_list_spec[0] = _AM_ALLPAGES;
+ $display_list_spec[-1] = _AM_TOPPAGE;
+ $display_list = $display_list_spec + $display_list;
+ foreach ($display_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $selmod ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> '; // <input type="hidden" name="fct" value="blocksadmin" />';
+ printf(_AM_SVISIBLEIN, $form);
+ unset($display_list[-2]);
+
+ // For selection of group access
+ $member_handler =& xoops_gethandler('member');
+ $group_list = $member_handler->getGroupList();
+ $group_sel = _AM_GROUP." <select size=\"1\" name=\"selgrp\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selvis=$selvis&seldom=$seldom&selmod=$selmod&selgrp='+this.options[this.selectedIndex].value\">";
+ $group_list[0] = _AM_UNASSIGNED;
+ $group_list[-1] = _AM_TYPES;
+ foreach ($group_list as $k => $v) {
+ $group_sel .= '<option value="'.$k.'"' . ($k == $selgrp ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $group_sel .= '</select> ';
+ echo $group_sel;
+
+ // For selection of visiblility
+ echo _AM_VISIBLE." <select size=\"1\" name=\"selvis\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selmod=$selmod&seldom=$seldom&selgrp=$selgrp&selvis='+this.options[this.selectedIndex].value\">";
+ echo '<option value="0"' . ($selvis == 0 ? ' selected="selected"' : '') . '>'._NO.'</option>';
+ echo '<option value="1"' . ($selvis == 1 ? ' selected="selected"' : '') . '>'._YES.'</option>';
+ echo '<option value="-1"' . ($selvis == -1 ? ' selected="selected"' : '') . '>'._AM_TYPES.'</option>';
+ echo '</select> <input type="hidden" name="fct" value="blocksadmin" /><input type="submit" value="'._GO.'" name="selsubmit" />';
+ echo '</form><br />';
+
+ echo "<form action='admin.php' name='blockadmin' method='post'>
+ <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+ <tr valign='middle' align='center'>
+ <th width='15%'>"._AM_TITLE."</th>
+ <th width='20%'>"._AM_BLKDESC."</th>
+ <th width='10%'>"._AM_MODULE."</th>
+ <th width='10%' nowrap='nowrap'>"._AM_SIDE."<br />"._LEFT."-"._CENTER."-"._RIGHT."</th>
+ <th width='10%'>"._AM_VISIBLEIN."</th>
+ <th width='10%'>"._AM_DOMAINSIN."</th>
+ <th width='10%'>"._AM_BCACHETIME."</th>
+ <th width='10%'>"._AM_VISIBLE."</th>
+ <th width='10%'>"._AM_WEIGHT."</th>
+ <th>"._AM_ACTION."</th>
+ </tr>
+ ";
+ if ($selvis == -1) {
+ //$selvis = null;
+ }
+
+ $order_block = ( isset($selvis) ? "" : "b.visible DESC, " ) . "b.side,b.weight,b.bid";
+ $vis_block = ( $selvis == -1 ) ? null : $selvis;
+ $mod_block = ( $selmod == -2 ) ? null : $selmod;
+ if ($selgrp == 0) {
+ // get blocks that are not assigned to any groups
+ $block_arr = MultisiteBlock::getNonGroupedBlocks($mod_block, $toponlyblock = false, $vis_block, $order_block. true, false);
+ } else {
+ $grp_block = ( $selgrp == -1 ) ? null : $selgrp;
+ $block_arr = MultisiteBlock::getAllByGroupModule($grp_block, $mod_block, $toponlyblock = false, $vis_block, $order_block, true, false);
+ }
+ if ($selgen >= 0) {
+ foreach (array_keys($block_arr) as $bid) {
+ if ($block_arr[$bid]->getVar("mid") != $selgen) {
+ unset($block_arr[$bid]);
+ }
+ }
+ }
+ if ($seldom != 'all') {
+ foreach (array_keys($block_arr) as $bid) {
+ if (!in_array($seldom,explode('|',$block_arr[$bid]->getVar("domains")))) {
+ unset($block_arr[$bid]);
+ }
+ }
+ }
+ //xoops_result(array_keys($block_arr));
+ $block_count = count($block_arr);
+ $class = 'even';
+
+ $block_mod = array();
+ if ($block_count) {
+ $sql = 'SELECT block_id, module_id FROM '.$xoopsDB->prefix('block_module_link').' WHERE block_id IN (' . implode(', ', array_keys($block_arr)) . ')';
+ $result = $xoopsDB->query($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $block_mod[$row['block_id']][] = $row['module_id'];
+ }
+ }
+
+ $bcachetime = array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH) ;
+
+ foreach (array_keys($block_arr) as $i) {
+ $module_options = '';
+ foreach ( $display_list as $key => $mod ) {
+ if ( !empty($block_mod[$i]) && in_array($key, $block_mod[$i]) ) {
+ $module_options .= "<option value='$key' selected='selected'>$mod</a>" ;
+ } else {
+ $module_options .= "<option value='$key'>$mod</a>" ;
+ }
+ }
+
+ $domain_options = '';
+ foreach ( $domain_list as $key => $mod ) {
+ if ( strpos(' '.$block_arr[$i]->getVar('domains'),$key) ) {
+ $domain_options .= "<option value='$key' selected='selected'>$mod</a>" ;
+ } else {
+ $domain_options .= "<option value='$key'>$mod</a>" ;
+ }
+ }
+ $cachetime_options = '';
+ foreach ( $bcachetime as $key => $cachetime ) {
+ if ( $key == $block_arr[$i]->getVar('bcachetime') ) {
+ $cachetime_options .= "<option value='$key' selected='selected'>$cachetime</option>";
+ } else {
+ $cachetime_options .= "<option value='$key'>$cachetime</option>";
+ }
+
+ }
+
+ $sel0 = $sel1 = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = $ssel5 = $ssel6 = $ssel7 = "";
+ if ( $block_arr[$i]->getVar("visible") == 1 ) {
+ $sel1 = " checked='checked'";
+ } else {
+ $sel0 = " checked='checked'";
+ }
+ if ( $block_arr[$i]->getVar("side") == XOOPS_SIDEBLOCK_LEFT) {
+ $ssel0 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_SIDEBLOCK_RIGHT ) {
+ $ssel1 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_LEFT ) {
+ $ssel2 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_RIGHT ) {
+ $ssel4 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_CENTER ) {
+ $ssel3 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOMLEFT ) {
+ $ssel5 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOMRIGHT ) {
+ $ssel6 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOM ) {
+ $ssel7 = " checked='checked'";
+ }
+ $title = $block_arr[$i]->getVar("title");
+ $name = $block_arr[$i]->getVar("name");
+ echo "<tr valign='top'>
+ <td class='$class'><input type='text' name=title[$i] value='".$title."' size='30' /></td>
+ <td class='$class'>".$name."</td>
+ <td class='$class'>".$generator_list[$block_arr[$i]->getVar('mid')]."</td>
+ <td class='$class' align='center' nowrap='nowrap'>
+ <div align='center' >
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_LEFT."'$ssel2 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_CENTER."'$ssel3 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_RIGHT."'$ssel4 />
+ </div>
+ <div>
+ <span style='float:right'><input type='radio' name='side[$i]' value='".XOOPS_SIDEBLOCK_RIGHT."'$ssel1 /></span>
+ <div align='left'><input type='radio' name='side[$i]' value='".XOOPS_SIDEBLOCK_LEFT."'$ssel0 /></div>
+ </div>
+ <div align='center'>
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOMLEFT."'$ssel5 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOM."'$ssel7 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOMRIGHT."'$ssel6 />
+ </div>
+ </td>
+ <td class='$class' align='center'>
+ <select name='bmodule[$i][]' size='5' multiple='multiple'>
+ $module_options
+ </select>
+ </td>
+ <td class='$class' align='center'>
+ <select name='domains[$i][]' size='5' multiple='multiple'>
+ $domain_options
+ </select>
+ </td>
+ <td class='$class' align='center'>
+ <select name='bcachetime[$i]' size='1'>
+ $cachetime_options
+ </select>
+ </td>
+ <td class='$class' align='center' nowrap><input type='radio' name='visible[$i]' value='1'$sel1>"._YES." <input type='radio' name='visible[$i]' value='0'$sel0>"._NO."</td>
+ <td class='$class' align='center'><input type='text' name='weight[$i]' value='".$block_arr[$i]->getVar("weight")."' size='5' maxlength='5' /></td>
+ <td class='$class' align='right'><a href='admin.php?fct=blocksadmin&op=edit&bid=".$block_arr[$i]->getVar("bid")."'>"._EDIT."</a>";
+ echo "<br /><a href='admin.php?fct=blocksadmin&op=clone&bid=".$block_arr[$i]->getVar("bid")."'>"._AM_CLONE."</a>";
+ if ($block_arr[$i]->getVar('block_type') != 'S') {
+ echo "<br /><a href='admin.php?fct=blocksadmin&op=delete&bid=".$block_arr[$i]->getVar("bid")."'>"._DELETE."</a>";
+ }
+ echo "
+ <input type='hidden' name='oldside[$i]' value='".$block_arr[$i]->getVar('side')."' />
+ <input type='hidden' name='oldweight[$i]' value='".$block_arr[$i]->getVar('weight')."' />
+ <input type='hidden' name='oldvisible[$i]' value='".$block_arr[$i]->getVar('visible')."' />
+ <input type='hidden' name='oldbmodule[$i]' value='".@implode(',', $block_mod[$i])."'/>
+ <input type='hidden' name='oldtitle[$i]' value='".$block_arr[$i]->getVar('title')."'/>
+ <input type='hidden' name='oldbcachetime[$i]' value='".$block_arr[$i]->getVar('bcachetime')."'/>
+ <input type='hidden' name='bid[$i]' value='".$i."' />
+ </td></tr>
+ ";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ }
+ echo "<tr><td class='foot' align='center' colspan='10'>
+ <input type='hidden' name='fct' value='blocksadmin' />
+ <input type='hidden' name='op' value='order' />
+ ".$GLOBALS['xoopsSecurity']->getTokenHTML()."
+ <input type='submit' name='submit' value='"._SUBMIT."' />
+ </td></tr></table>
+ </form>
+ <br /><br />";
+
+ $block = array('form_title' => _AM_ADDBLOCK, 'side' => 0, 'weight' => 0, 'visible' => 1, 'title' => '', 'content' => '', 'modules' => array(-1), 'is_custom' => true, 'ctype' => 'H', 'cachetime' => 0, 'op' => 'save', 'edit_form' => false);
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+}
+
+function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bmodule, $bcachetime, $domains)
+{
+ global $xoopsUser;
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $myblock = new MultisiteBlock();
+ $myblock->setVar('side', $bside);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('visible', $bvisible);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('title', $btitle);
+ $myblock->setVar('content', $bcontent);
+ $myblock->setVar('c_type', $bctype);
+ $myblock->setVar('block_type', 'C');
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ switch ($bctype) {
+ case 'H':
+ $name = _AM_CUSTOMHTML;
+ break;
+ case 'P':
+ $name = _AM_CUSTOMPHP;
+ break;
+ case 'S':
+ $name = _AM_CUSTOMSMILE;
+ break;
+ default:
+ $name = _AM_CUSTOMNOSMILE;
+ break;
+ }
+ $myblock->setVar('name', $name);
+ $newid = $myblock->store();
+ if (!$newid) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $myblock->getHtmlErrors();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $db =& Database::getInstance();
+ foreach ($bmodule as $bmid) {
+ $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.intval($bmid).')';
+ $db->query($sql);
+ }
+ $groups = array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS);
+ $count = count($groups);
+ for ($i = 0; $i < $count; $i++) {
+ $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_name, gperm_modid) VALUES (".$groups[$i].", ".$newid.", 'block_read', 1)";
+ $db->query($sql);
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+ exit();
+}
+
+function edit_block($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ $db =& Database::getInstance();
+ $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
+ $result = $db->query($sql);
+ $modules = array();
+ while ($row = $db->fetchArray($result)) {
+ $modules[] = intval($row['module_id']);
+ }
+ $is_custom = $myblock->isCustom();
+ $block = array('form_title' => _AM_EDITBLOCK, 'name' => $myblock->getVar('name'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'title' => $myblock->getVar('title', 'E'), 'content' => $myblock->getVar('content', 'E'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'update', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'domains' => $myblock->getVar('domains'));
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_EDITBLOCK.'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+}
+
+function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $domains, $options=array())
+{
+ global $xoopsConfig;
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $myblock = new MultisiteBlock($bid);
+ $myblock->setVar('side', $bside);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('visible', $bvisible);
+ $myblock->setVar('title', $btitle);
+ $myblock->setVar('content', $bcontent);
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ if (isset($options)) {
+ $options_count = count($options);
+ if ($options_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $options_count; $i++ ) {
+ if (is_array($options[$i])) {
+ $options[$i] = implode(',', $options[$i]);
+ }
+ }
+ $options = implode('|', $options);
+ $myblock->setVar('options', $options);
+ }
+ }
+ if ($myblock->isCustom()) {
+ switch ($bctype) {
+ case 'H':
+ $name = _AM_CUSTOMHTML;
+ break;
+ case 'P':
+ $name = _AM_CUSTOMPHP;
+ break;
+ case 'S':
+ $name = _AM_CUSTOMSMILE;
+ break;
+ default:
+ $name = _AM_CUSTOMNOSMILE;
+ break;
+ }
+ $myblock->setVar('name', $name);
+ $myblock->setVar('c_type', $bctype);
+ } else {
+ $myblock->setVar('c_type', 'H');
+ }
+ $msg = _AM_DBUPDATED;
+ if ($myblock->store() != false) {
+ $db =& Database::getInstance();
+ $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
+ $db->query($sql);
+ foreach ($bmodule as $bmid) {
+ $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $db->prefix('block_module_link'), $bid, intval($bmid));
+ $db->query($sql);
+ }
+ include_once XOOPS_ROOT_PATH.'/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+ $xoopsTpl->xoops_setCaching(2);
+ if ($myblock->getVar('template') != '') {
+ if ($xoopsTpl->is_cached('db:'.$myblock->getVar('template'), 'blk_'.$myblock->getVar('bid'))) {
+ if (!$xoopsTpl->clear_cache('db:'.$myblock->getVar('template'), 'blk_'.$myblock->getVar('bid'))) {
+ $msg = 'Unable to clear cache for block ID '.$bid;
+ }
+ }
+ } else {
+ if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) {
+ if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'blk_'.$bid)) {
+ $msg = 'Unable to clear cache for block ID '.$bid;
+ }
+ }
+ }
+ } else {
+ $msg = 'Failed update of block. ID:'.$bid;
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,$msg);
+ exit();
+}
+
+function delete_block($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ if ( $myblock->getVar('block_type') == 'S' ) {
+ $message = _AM_SYSTEMCANT;
+ redirect_header('admin.php?fct=blocksadmin',4,$message);
+ exit();
+ } elseif ($myblock->getVar('block_type') == 'M') {
+ // Fix for duplicated blocks created in 2.0.9 module update
+ // A module block can be deleted if there is more than 1 that
+ // has the same func_num/show_func which is mostly likely
+ // be the one that was duplicated in 2.0.9
+ if (1 >= $count = MultisiteBlock::countSimilarBlocks($myblock->getVar('mid'), $myblock->getVar('func_num'), $myblock->getVar('show_func'))) {
+ $message = _AM_MODULECANT;
+ redirect_header('admin.php?fct=blocksadmin',4,$message);
+ exit();
+ }
+ }
+ xoops_confirm(array('fct' => 'blocksadmin', 'op' => 'delete_ok', 'bid' => $myblock->getVar('bid')), 'admin.php', sprintf(_AM_RUSUREDEL,$myblock->getVar('title')));
+}
+
+function delete_block_ok($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ $myblock->delete();
+ if ($myblock->getVar('template') != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $bid);
+ if (count($btemplate) > 0) {
+ $tplfile_handler->delete($btemplate[0]);
+ }
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+ exit();
+}
+
+function order_block($bid, $weight, $visible, $side , $title, $bmodule, $bcachetime, $domains)
+{
+ $myblock = new MultisiteBlock($bid);
+ $myblock->setVar('title', $title);
+ $myblock->setVar('weight', $weight);
+ $myblock->setVar('visible', $visible);
+ $myblock->setVar('side', $side);
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ $myblock->store();
+
+ $db =& Database::getInstance();
+ $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
+ $db->queryF($sql);
+
+ foreach ( $bmodule as $bmid ) {
+ $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $db->prefix('block_module_link'), $bid, intval($bmid));
+ $db->queryF($sql);
+ }
+}
+
+function clone_block($bid)
+{
+ global $xoopsConfig;
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $myblock = new MultisiteBlock($bid);
+ $db =& Database::getInstance();
+ $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . intval($bid);
+ $result = $db->query($sql);
+ $modules = array();
+ while ($row = $db->fetchArray($result)) {
+ $modules[] = intval($row['module_id']);
+ }
+ $is_custom = $myblock->isCustom();
+ $block = array('form_title' => _AM_CLONEBLOCK, 'name' => $myblock->getVar('name'), 'title' => $myblock->getVar('title'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'content' => $myblock->getVar('content', 'N'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'clone_ok', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'domains' => $myblock->getVar('domains'));
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_CLONEBLOCK.'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+function clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $domains, $options = array())
+{
+ global $xoopsUser;
+ /*
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(0);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ */
+ $block = new MultisiteBlock($bid);
+ $clone =& $block->xoopsClone();
+ $clone->setVar('side', $bside);
+ $clone->setVar('weight', $bweight);
+ $clone->setVar('visible', $bvisible);
+ $clone->setVar('content', $bcontent);
+ $clone->setVar('title', $btitle);
+ $clone->setVar('bcachetime', $bcachetime);
+
+ if ( isset($domains) ) {
+ if ( is_array($domains) )
+ $domains = implode('|', $domains);
+ $clone->setVar('options', '|'.$domains);
+ }
+
+ if ( isset($options) && (count($options) > 0) ) {
+ $options = implode('|', $options);
+ $clone->setVar('options', $options);
+ }
+ $clone->setVar('bid', 0);
+ // Custom block
+ if ($block->isCustom()) {
+ $clone->setVar('block_type', 'C');
+ // Clone of system or module block
+ } else {
+ $clone->setVar('block_type', 'D');
+ }
+ $newid = $clone->store();
+ if (!$newid) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $clone->getHtmlErrors();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ if ($clone->getVar('template') != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $bid);
+ if (count($btemplate) > 0) {
+ $tplclone =& $btemplate[0]->xoopsClone();
+ $tplclone->setVar('tpl_id', 0);
+ $tplclone->setVar('tpl_refid', $newid);
+ $tplfile_handler->insert($tplclone);
+ }
+ }
+ $db =& Database::getInstance();
+ foreach ( @$bmodule as $bmid ) {
+ $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
+ $db->query($sql);
+ }
+
+ $sql = "SELECT gperm_groupid FROM ".$db->prefix('group_permission')." WHERE gperm_name='block_read' AND gperm_modid='1' AND gperm_itemid='$bid'" ;
+ $result = $db->query($sql);
+ while( list( $gid ) = $db->fetchRow( $result ) ) {
+ $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $newid, 1, 'block_read')";
+ $db->query($sql);
+ }
+
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+}
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17/admin/blocksadmin/index.html
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/blocksadmin/index.html (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/blocksadmin/index.html 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17/admin/blocksadmin/main.php
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/blocksadmin/main.php (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/blocksadmin/main.php 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1,221 @@
+<?php
+// $Id: main.php 1446 2008-04-17 14:43:45Z phppp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ exit("Access Denied");
+}
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include XOOPS_ROOT_PATH."/modules/multisite/admin/blocksadmin/blocksadmin.php";
+
+$op = "list";
+if ( isset($_POST) ) {
+ foreach ( $_POST as $k => $v ) {
+ $$k = $v;
+ }
+}
+
+if ( isset($_GET['op']) ) {
+ if ($_GET['op'] == "edit" || $_GET['op'] == "delete" || $_GET['op'] == "delete_ok" || $_GET['op'] == "clone") {
+ $op = $_GET['op'];
+ $bid = isset($_GET['bid']) ? intval($_GET['bid']) : 0;
+ }
+}
+
+if (isset($previewblock)) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ include_once XOOPS_ROOT_PATH.'/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+ $xoopsTpl->xoops_setCaching(0);
+ if (isset($bid)) {
+ $block['bid'] = $bid;
+ $block['form_title'] = _AM_EDITBLOCK;
+ $myblock = new XoopsBlock($bid);
+ $block['name'] = $myblock->getVar('name');
+ } else {
+ if ($op == 'save') {
+ $block['form_title'] = _AM_ADDBLOCK;
+ } else {
+ $block['form_title'] = _AM_CLONEBLOCK;
+ }
+ $myblock = new XoopsBlock();
+ $myblock->setVar('block_type', 'C');
+ }
+ $myts =& MyTextSanitizer::getInstance();
+ $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
+ $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
+ $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.$xoopsConfig['sitename'].'</title><link rel="stylesheet" type="text/css" media="all" href="'.xoops_getcss($xoopsConfig['theme_set']).'" /></head><body><table><tr><th>'.$myblock->getVar('title').'</th></tr><tr><td>'.$myblock->getContent('S', $bctype).'</td></tr></table></body></html>';
+
+ $block['edit_form'] = false;
+ $block['template'] = '';
+ $block['op'] = $op;
+ $block['side'] = $bside;
+ $block['weight'] = $bweight;
+ $block['visible'] = $bvisible;
+ $block['title'] = $myblock->getVar('title', 'E');
+ $block['content'] = $myblock->getVar('content', 'E');
+ $block['modules'] =& $bmodule;
+ $block['domains'] =& $domains;
+ $block['ctype'] = isset($bctype) ? $bctype : $myblock->getVar('c_type');
+ $block['is_custom'] = true;
+ $block['cachetime'] = intval($bcachetime);
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '.$block['form_title'].'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+ footer_adminMenu();
+ xoops_cp_footer();
+ echo '<script type="text/javascript">
+ <!--//
+ win = openWithSelfMain("", "popup", 250, 200, true);
+ win.document.clear();
+ ';
+ $lines = preg_split("/(\r\n|\r|\n)( *)/", $dummyhtml);
+ foreach ($lines as $line) {
+ echo 'win.document.writeln("'.str_replace('"', '\"', $line).'");';
+ }
+ echo '
+ win.focus();
+ win.document.close();
+ //-->
+ </script>';
+ exit();
+}
+
+if ( $op == "list" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ list_blocks();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ( $op == "order" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $key = 0 ;
+ $tmpoldbmodule = array();
+ foreach ( $oldbmodule as $key => $eachBmodule ) {
+ $tmpoldbmodule[$key] = @explode(',', $eachBmodule);
+ }
+ unset($oldbmodule);
+ $oldbmodule = $tmpoldbmodule;
+ unset($tmpoldbmodule);
+
+ foreach (array_keys($bid) as $i) {
+ $isChange = 0 ;
+ $list = array('title', 'weight', 'visible', 'side', 'bcachetime', 'bmodule', 'domains');
+ foreach ($list as $each) {
+ if ( is_array(${$each}[$i]) ) {
+ if ( count(${$each}[$i]) != count(${'old'.$each}[$i]) ) {
+ $isChange = 1;
+ } elseif ( array_diff(${$each}[$i], ${'old'.$each}[$i]) ) {
+ $isChange = 1;
+ }
+ } elseif ( trim(${'old'.$each}[$i]) != trim(${$each}[$i]) ) {
+ $isChange = 1;
+ }
+ }
+ if ( $isChange == 1 ) {
+ order_block($bid[$i], $weight[$i], $visible[$i], $side[$i], $title[$i], $bmodule[$i], $bcachetime[$i], $domains[$i]);
+ }
+ }
+ redirect_header("admin.php?fct=blocksadmin", 1, _AM_DBUPDATED);
+ exit();
+}
+
+if ( $op == "save" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bmodule, $bcachetime, $domains);
+ exit();
+}
+
+if ( $op == "update" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ $bcachetime = isset($bcachetime) ? intval($bcachetime) : 0;
+ $options = isset($options) ? $options : array();
+ $bcontent = isset($bcontent) ? $bcontent : '';
+ $bctype = isset($bctype) ? $bctype : '';
+ update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $domains, $options);
+}
+
+
+if ( $op == "delete_ok" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ delete_block_ok($bid);
+ exit();
+}
+
+if ( $op == "delete" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ delete_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ( $op == "edit" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ edit_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ($op == 'clone') {
+ clone_block($bid);
+}
+
+if ($op == 'clone_ok') {
+ $options = isset($options) ? $options : array();
+ $bcontent = isset($bcontent) ? $bcontent : '';
+ clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $domains, $options);
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17/admin/blocksadmin/xoops_version.php
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/blocksadmin/xoops_version.php (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/blocksadmin/xoops_version.php 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1,44 @@
+<?php
+// $Id: xoops_version.php 2 2005-11-02 18:23:29Z skalpa $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+$modversion['name'] = _MD_AM_BKAD;
+$modversion['version'] = "";
+$modversion['description'] = "Side Blocks Administration";
+$modversion['author'] = "";
+$modversion['credits'] = "The MPN SE Project";
+$modversion['help'] = "blocks.html";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 1;
+$modversion['image'] = "blocksadmin.gif";
+$modversion['hasAdmin'] = 1;
+$modversion['adminpath'] = "admin.php?fct=blocksadmin";
+$modversion['category'] = XOOPS_MULTISITE_BLOCK;
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17/admin/domainsadmin/domainsadmin.php
===================================================================
--- XoopsModules/multisite/releases/1.17/admin/domainsadmin/domainsadmin.php (rev 0)
+++ XoopsModules/multisite/releases/1.17/admin/domainsadmin/domainsadmin.php 2009-03-22 01:36:03 UTC (rev 3063)
@@ -0,0 +1,341 @@
+<?php
+// $Id: modulesadmin.php 2701 2009-01-20 23:45:46Z dugris $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// ...
[truncated message content] |
|
From: <du...@us...> - 2009-03-21 18:09:48
|
Revision: 3062
http://xoops.svn.sourceforge.net/xoops/?rev=3062&view=rev
Author: dugris
Date: 2009-03-21 18:09:46 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.2.6/
Removed Paths:
-------------
XoopsCore/releases/2.2.6/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 18:08:07
|
Revision: 3061
http://xoops.svn.sourceforge.net/xoops/?rev=3061&view=rev
Author: dugris
Date: 2009-03-21 18:08:00 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.2.5-security/
Removed Paths:
-------------
XoopsCore/releases/2.2.5-security/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 18:06:05
|
Revision: 3060
http://xoops.svn.sourceforge.net/xoops/?rev=3060&view=rev
Author: dugris
Date: 2009-03-21 18:05:56 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.2.5/
Removed Paths:
-------------
XoopsCore/releases/2.2.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 18:03:31
|
Revision: 3059
http://xoops.svn.sourceforge.net/xoops/?rev=3059&view=rev
Author: dugris
Date: 2009-03-21 18:03:22 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.18.2/
Removed Paths:
-------------
XoopsCore/releases/2.0.18.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 18:02:02
|
Revision: 3058
http://xoops.svn.sourceforge.net/xoops/?rev=3058&view=rev
Author: dugris
Date: 2009-03-21 18:01:53 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.18.1/
Removed Paths:
-------------
XoopsCore/releases/2.0.18.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 18:00:17
|
Revision: 3057
http://xoops.svn.sourceforge.net/xoops/?rev=3057&view=rev
Author: dugris
Date: 2009-03-21 18:00:08 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.18/
Removed Paths:
-------------
XoopsCore/releases/2.0.18/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:58:31
|
Revision: 3056
http://xoops.svn.sourceforge.net/xoops/?rev=3056&view=rev
Author: dugris
Date: 2009-03-21 17:58:22 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.17.1/
Removed Paths:
-------------
XoopsCore/releases/2.0.17.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:55:08
|
Revision: 3055
http://xoops.svn.sourceforge.net/xoops/?rev=3055&view=rev
Author: dugris
Date: 2009-03-21 17:54:56 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.17/
Removed Paths:
-------------
XoopsCore/releases/2.0.17/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:51:31
|
Revision: 3054
http://xoops.svn.sourceforge.net/xoops/?rev=3054&view=rev
Author: dugris
Date: 2009-03-21 17:51:15 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.16/
Removed Paths:
-------------
XoopsCore/releases/2.0.16/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:49:23
|
Revision: 3053
http://xoops.svn.sourceforge.net/xoops/?rev=3053&view=rev
Author: dugris
Date: 2009-03-21 17:49:14 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.15/
Removed Paths:
-------------
XoopsCore/releases/2.0.15/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:46:00
|
Revision: 3052
http://xoops.svn.sourceforge.net/xoops/?rev=3052&view=rev
Author: dugris
Date: 2009-03-21 17:45:50 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/2.0.14/
Removed Paths:
-------------
XoopsCore/releases/2.0.14/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2009-03-21 17:42:53
|
Revision: 3051
http://xoops.svn.sourceforge.net/xoops/?rev=3051&view=rev
Author: dugris
Date: 2009-03-21 17:42:43 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Moved to archives
Added Paths:
-----------
Archives/XoopsCore-releases/3.0.0-a2/
Removed Paths:
-------------
XoopsCore/releases/3.0.0-a2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2009-03-21 14:19:52
|
Revision: 3050
http://xoops.svn.sourceforge.net/xoops/?rev=3050&view=rev
Author: dhcst
Date: 2009-03-21 14:19:45 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
add theme lang
Added Paths:
-----------
XoopsLanguages/german/core/2.3.3/htdocs/themes/
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/main.php
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/script.js
XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/style.css
Added: XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/main.php
===================================================================
--- XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/main.php (rev 0)
+++ XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/main.php 2009-03-21 14:19:45 UTC (rev 3050)
@@ -0,0 +1,19 @@
+<?php
+
+// Theme language definitions
+
+// $Id: main.php 2857 2009-03-21 11:12:11Z dhcst $
+// _LANGCODE: de
+// _CHARSET : UTF-8
+// Translator: XOOPS üTranslation Team
+
+/* ------------------- userbar.html ------------------- */
+define("_THEME_REGISTER", "User Registration");
+define("_THEME_INBOX", "Mitteilungen anzeigen");
+define("_THEME_INBOX_NOTREAD", "Nachricht(en) ungelesen");
+define("_THEME_NOTIFICATIONS", "Benachrichtigungen");
+define("_THEME_PROFILE", "Profil ansehen");
+define("_THEME_ADMINISTRATION", "Administration");
+define("_THEME_LOGOUT", "Abmelden");
+
+?>
Added: XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/script.js
===================================================================
--- XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/script.js (rev 0)
+++ XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/script.js 2009-03-21 14:19:45 UTC (rev 3050)
@@ -0,0 +1,2 @@
+/* $Id$ */
+/* Localization script */
\ No newline at end of file
Added: XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/style.css
===================================================================
--- XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/style.css (rev 0)
+++ XoopsLanguages/german/core/2.3.3/htdocs/themes/zetagenesis/language/german/style.css 2009-03-21 14:19:45 UTC (rev 3050)
@@ -0,0 +1,2 @@
+/* $Id$ */
+/* Localization stylesheet */
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dh...@us...> - 2009-03-21 14:07:03
|
Revision: 3049
http://xoops.svn.sourceforge.net/xoops/?rev=3049&view=rev
Author: dhcst
Date: 2009-03-21 14:07:01 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
fixed typo
Modified Paths:
--------------
XoopsLanguages/german/core/2.3.3/htdocs/language/german/admin.php
Modified: XoopsLanguages/german/core/2.3.3/htdocs/language/german/admin.php
===================================================================
--- XoopsLanguages/german/core/2.3.3/htdocs/language/german/admin.php 2009-03-21 09:29:50 UTC (rev 3048)
+++ XoopsLanguages/german/core/2.3.3/htdocs/language/german/admin.php 2009-03-21 14:07:01 UTC (rev 3049)
@@ -5,7 +5,7 @@
// Translator: XOOPS Translation Team
//%%%%%% File Name admin.php %%%%%
-define("_AD_NORIGHT","Die erforderlichen Userrechte um diesen Bereich zu betreten sind nicht vorhanden.");
+define("_AD_NORIGHT","Die erforderlichen Userrechte für diesen Bereich sind nicht vorhanden.");
define("_AD_ACTION","Aktion:");
define("_AD_EDIT","Bearbeiten");
define("_AD_DELETE","Löschen");
@@ -17,9 +17,9 @@
define('_AD_PRESSGEN', 'Dies ist das erste Mal, dass Du den Admin-Bereich betrittst. Bitte klicke auf \"Abschicken\" um fortzufahren.');
define('_AD_LOGINADMIN', 'EINLOGGEN...');
-define("_AD_WARNINSTALL2","WARNUNG: Das Verzeichnis %s existiert noch auf dem Server. Entfernen Sie bitte dieses Verzeichnis aus Sicherheitsgründen.");
-define("_AD_WARNINWRITEABLE","WARNUNG: Die Datei %s ist nicht schreibgeschützt auf dem Server. <br />Bitte setzen Sie die Zugriffsrechte richtig. Ansonsten wird das zu einem Sicherheitsrisiko!<br /> (unter Unix (444), unter Win32 (schreibgeschützt))");
-define("_AD_WARNINNOTWRITEABLE","WARNUNG: Verzeichnis %s ist nicht beschreibbar vom Server. <br />Bitte ändern Sie die Schreibrechte dieses Ordners.<br /> für Unix (777), für Windows (readable)");
+define("_AD_WARNINGINSTALL","WARNUNG: Das Verzeichnis %s existiert noch auf dem Server. Entfernen Sie bitte dieses Verzeichnis aus Sicherheitsgründen.");
+define("_AD_WARNINGWRITEABLE","WARNUNG: Die Datei %s ist nicht schreibgeschützt auf dem Server. <br />Bitte setzen Sie die Zugriffsrechte richtig. Ansonsten wird das zu einem Sicherheitsrisiko!<br /> (unter Unix (444), unter Win32 (schreibgeschützt))");
+define("_AD_WARNINGNOTWRITEABLE","WARNUNG: Verzeichnis %s ist nicht beschreibbar vom Server. <br />Bitte ändern Sie die Schreibrechte dieses Ordners.<br /> für Unix (777), für Windows (readable)");
define("_AD_WARNINGXOOPSLIBINSIDE","WARNUNG: Verzeichnis %s ist innerhalb des DocumentRoot!<br />In diesem Ordner befinden sich sensible Daten. Dieser sollte daher vor Zugriffen aus dem Web geschützt werden.");
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2009-03-21 09:30:00
|
Revision: 3048
http://xoops.svn.sourceforge.net/xoops/?rev=3048&view=rev
Author: wishcraft
Date: 2009-03-21 09:29:50 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
1.17 RC - Multisite Module for XOOPS 2.3.x
Added Paths:
-----------
XoopsModules/multisite/releases/1.17 RC/
XoopsModules/multisite/releases/1.17 RC/admin/
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blockform.php
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blocksadmin.php
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/index.html
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/main.php
XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/
XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/domainsadmin.php
XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/index.html
XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/main.php
XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin/groupperm.php
XoopsModules/multisite/releases/1.17 RC/admin/index.html
XoopsModules/multisite/releases/1.17 RC/admin/menu.php
XoopsModules/multisite/releases/1.17 RC/admin/modulesadmin/
XoopsModules/multisite/releases/1.17 RC/admin/modulesadmin/index.html
XoopsModules/multisite/releases/1.17 RC/admin/modulesadmin/main.php
XoopsModules/multisite/releases/1.17 RC/admin/modulesadmin/modulesadmin.php
XoopsModules/multisite/releases/1.17 RC/admin/modulesadmin/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin/policiesadmin/
XoopsModules/multisite/releases/1.17 RC/admin/policiesadmin/index.html
XoopsModules/multisite/releases/1.17 RC/admin/policiesadmin/main.php
XoopsModules/multisite/releases/1.17 RC/admin/policiesadmin/policiesadmin.php
XoopsModules/multisite/releases/1.17 RC/admin/policiesadmin/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin/preferences/
XoopsModules/multisite/releases/1.17 RC/admin/preferences/index.html
XoopsModules/multisite/releases/1.17 RC/admin/preferences/main.php
XoopsModules/multisite/releases/1.17 RC/admin/preferences/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin/version/
XoopsModules/multisite/releases/1.17 RC/admin/version/index.html
XoopsModules/multisite/releases/1.17 RC/admin/version/main.php
XoopsModules/multisite/releases/1.17 RC/admin/version/s_poweredby.gif
XoopsModules/multisite/releases/1.17 RC/admin/version/xoops_version.php
XoopsModules/multisite/releases/1.17 RC/admin.php
XoopsModules/multisite/releases/1.17 RC/blocks/
XoopsModules/multisite/releases/1.17 RC/blocks/index.html
XoopsModules/multisite/releases/1.17 RC/blocks/multisite_blocks.php
XoopsModules/multisite/releases/1.17 RC/class/
XoopsModules/multisite/releases/1.17 RC/class/block.php
XoopsModules/multisite/releases/1.17 RC/class/domain.php
XoopsModules/multisite/releases/1.17 RC/class/domaincategory.php
XoopsModules/multisite/releases/1.17 RC/class/domainitem.php
XoopsModules/multisite/releases/1.17 RC/class/domainoption.php
XoopsModules/multisite/releases/1.17 RC/class/feeds.php
XoopsModules/multisite/releases/1.17 RC/class/formselectdomains.php
XoopsModules/multisite/releases/1.17 RC/class/module.php
XoopsModules/multisite/releases/1.17 RC/class/policy.php
XoopsModules/multisite/releases/1.17 RC/constants.php
XoopsModules/multisite/releases/1.17 RC/images/
XoopsModules/multisite/releases/1.17 RC/images/Thumbs.db
XoopsModules/multisite/releases/1.17 RC/images/bg_content.gif
XoopsModules/multisite/releases/1.17 RC/images/bg_menu.gif
XoopsModules/multisite/releases/1.17 RC/images/check.gif
XoopsModules/multisite/releases/1.17 RC/images/delete.png
XoopsModules/multisite/releases/1.17 RC/images/edit.png
XoopsModules/multisite/releases/1.17 RC/images/hbar_left.gif
XoopsModules/multisite/releases/1.17 RC/images/hbar_middle.gif
XoopsModules/multisite/releases/1.17 RC/images/hbar_right.gif
XoopsModules/multisite/releases/1.17 RC/images/index.html
XoopsModules/multisite/releases/1.17 RC/images/info.gif
XoopsModules/multisite/releases/1.17 RC/images/install.gif
XoopsModules/multisite/releases/1.17 RC/images/left_both.gif
XoopsModules/multisite/releases/1.17 RC/images/logo.gif
XoopsModules/multisite/releases/1.17 RC/images/menu.gif
XoopsModules/multisite/releases/1.17 RC/images/multisite_slogo.gif
XoopsModules/multisite/releases/1.17 RC/images/powered_by_xoops.gif
XoopsModules/multisite/releases/1.17 RC/images/right_both.gif
XoopsModules/multisite/releases/1.17 RC/images/uninstall.gif
XoopsModules/multisite/releases/1.17 RC/images/update.gif
XoopsModules/multisite/releases/1.17 RC/images/xoops2.gif
XoopsModules/multisite/releases/1.17 RC/include/
XoopsModules/multisite/releases/1.17 RC/include/functions.php
XoopsModules/multisite/releases/1.17 RC/include/index.html
XoopsModules/multisite/releases/1.17 RC/include/install.php
XoopsModules/multisite/releases/1.17 RC/include/uninstall.php
XoopsModules/multisite/releases/1.17 RC/include/update.php
XoopsModules/multisite/releases/1.17 RC/index.html
XoopsModules/multisite/releases/1.17 RC/language/
XoopsModules/multisite/releases/1.17 RC/language/english/
XoopsModules/multisite/releases/1.17 RC/language/english/admin/
XoopsModules/multisite/releases/1.17 RC/language/english/admin/blocksadmin.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/comments.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/domainsadmin.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/index.html
XoopsModules/multisite/releases/1.17 RC/language/english/admin/modulesadmin.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/policiesadmin.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/preferences.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin/version.php
XoopsModules/multisite/releases/1.17 RC/language/english/admin.php
XoopsModules/multisite/releases/1.17 RC/language/english/blocks.php
XoopsModules/multisite/releases/1.17 RC/language/english/cpanel.php
XoopsModules/multisite/releases/1.17 RC/language/english/index.html
XoopsModules/multisite/releases/1.17 RC/language/english/modinfo.php
XoopsModules/multisite/releases/1.17 RC/language/index.html
XoopsModules/multisite/releases/1.17 RC/menu.php
XoopsModules/multisite/releases/1.17 RC/post.load.php
XoopsModules/multisite/releases/1.17 RC/pre.load.php
XoopsModules/multisite/releases/1.17 RC/sql/
XoopsModules/multisite/releases/1.17 RC/sql/multisite.sql
XoopsModules/multisite/releases/1.17 RC/style.css
XoopsModules/multisite/releases/1.17 RC/templates/
XoopsModules/multisite/releases/1.17 RC/templates/blocks/
XoopsModules/multisite/releases/1.17 RC/templates/blocks/index.html
XoopsModules/multisite/releases/1.17 RC/templates/blocks/multisite_block_mainmenu.html
XoopsModules/multisite/releases/1.17 RC/templates/index.html
XoopsModules/multisite/releases/1.17 RC/templates/multisite_atom.html
XoopsModules/multisite/releases/1.17 RC/templates/multisite_rss.html
XoopsModules/multisite/releases/1.17 RC/templates/multisite_sitemap.html
XoopsModules/multisite/releases/1.17 RC/xoops_version.php
Added: XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blockform.php
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blockform.php (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blockform.php 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1,109 @@
+<?php
+// $Id: blockform.php 1993 2008-08-30 10:49:06Z phppp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+$form = new XoopsThemeForm($block['form_title'], 'blockform', 'admin.php', "post", true);
+if (isset($block['name'])) {
+ $form->addElement(new XoopsFormLabel(_AM_NAME, $block['name']));
+}
+$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
+$side_select->addOptionArray(array(0 => _AM_SBLEFT, 1 => _AM_SBRIGHT, 3 => _AM_CBLEFT, 4 => _AM_CBRIGHT, 5 => _AM_CBCENTER, 7 => _AM_CBBOTTOMLEFT, 8 => _AM_CBBOTTOMRIGHT, 9 => _AM_CBBOTTOM, ));
+$form->addElement($side_select);
+$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight']));
+$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible']));
+$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, true);
+$module_handler =& xoops_getmodulehandler('module','multisite');
+$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+$criteria->add(new Criteria('isactive', 1));
+$module_list = $module_handler->getList($criteria);
+$module_list[-1] = _AM_TOPPAGE;
+$module_list[0] = _AM_ALLPAGES;
+ksort($module_list);
+$mod_select->addOptionArray($module_list);
+$form->addElement($mod_select);
+
+$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
+if ( $block['is_custom'] ) {
+ $textarea = new XoopsFormDhtmlTextArea(_AM_CONTENT, 'bcontent', $block['content'], 15, 70);
+ $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'._AM_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
+ $textarea->doHtml = true;
+ $form->addElement($textarea, true);
+ $ctype_select = new XoopsFormSelect(_AM_CTYPE, 'bctype', $block['ctype']);
+ $ctype_select->addOptionArray(array('H' => _AM_HTML, 'P' => _AM_PHP, 'S' => _AM_AFWSMILE, 'T' => _AM_AFNOSMILE));
+ $form->addElement($ctype_select);
+} else {
+ if ($block['template'] != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
+ if (count($btemplate) > 0) {
+ $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="'.XOOPS_URL.'/modules/multisite/admin.php?fct=tplsets&op=edittpl&id='.$btemplate[0]->getVar('tpl_id').'">'._AM_EDITTPL.'</a>'));
+ } else {
+ $btemplate2 = $tplfile_handler->find('default', 'block', $block['bid']);
+ if (count($btemplate2) > 0) {
+ $form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="'.XOOPS_URL.'/modules/multisite/admin.php?fct=tplsets&op=edittpl&id='.$btemplate2[0]->getVar('tpl_id').'" rel="external">'._AM_EDITTPL.'</a>'));
+ }
+ }
+ }
+ if ($block['edit_form'] != false) {
+ $form->addElement(new XoopsFormLabel(_AM_OPTIONS, $block['edit_form']));
+ }
+}
+
+
+$domain_select = new XoopsFormSelect(_AM_DOMAINSIN, "domains", explode('|',$block['domains']), 5, true);
+$module_handler =& xoops_getmodulehandler('module','multisite');
+$module =& $module_handler->getByDirname('multisite');
+$domain_handler =& xoops_getmodulehandler('domain', 'multisite');
+
+$critera_z = new CriteriaCompo(new Criteria('dom_modid', $module->getVar('mid')));
+$critera_z->add(new Criteria('dom_catid', XOOPS_DOMAIN)) ;
+$critera_z->add(new Criteria('dom_name', 'domain')) ;
+$domains = $domain_handler->getDomains($critera_z);
+
+$domain_list['all'] = _AM_ALLDOMAINS;
+foreach($domains as $domain)
+ $domain_list[$domain->getVar('dom_value')] = $domain->getVar('dom_value');
+
+$domain_select->addOptionArray($domain_list);
+$form->addElement($domain_select);
+
+
+$cache_select = new XoopsFormSelect(_AM_BCACHETIME, 'bcachetime', $block['cachetime']);
+$cache_select->addOptionArray(array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH));
+$form->addElement($cache_select);
+if (isset($block['bid'])) {
+ $form->addElement(new XoopsFormHidden('bid', $block['bid']));
+}
+$form->addElement(new XoopsFormHidden('op', $block['op']));
+$form->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
+$button_tray = new XoopsFormElementTray('', ' ');
+if ($block['is_custom']) {
+ $button_tray->addElement(new XoopsFormButton('', 'previewblock', _PREVIEW, "submit"));
+}
+$button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, "submit"));
+$form->addElement($button_tray);
+?>
Added: XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blocksadmin.php
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blocksadmin.php (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/blocksadmin.php 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1,662 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS Block management
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package kernel
+ * @since 2.0
+ * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author Steven Li <ph...@us...>
+ * @version $Id: blocksadmin.php 2879 2009-02-27 00:53:34Z wishcraft $
+ * @package class
+ * @todo zone evolution
+ */
+
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ exit("Access Denied");
+}
+
+include_once XOOPS_ROOT_PATH.'/modules/multisite/class/block.php';
+
+function list_blocks()
+{
+ global $xoopsUser, $xoopsConfig, $xoopsDB;
+ include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+
+ $module_handler =& xoops_getmodulehandler('module','multisite');
+ $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+ $criteria->add(new Criteria('isactive', 1));
+ // Modules for blocks to be visible in
+ $display_list = $module_handler->getList($criteria);
+ unset($criteria);
+ // Modules generating the blocks
+ $generator_list = $module_handler->getList();
+ // for custom blocks
+ $generator_list[0] = _AM_CUSTOM;
+
+ $module_handler =& xoops_getmodulehandler('module','multisite');
+ $module =& $module_handler->getByDirname('multisite');
+ $domains_handler =& xoops_getmodulehandler('domain', 'multisite');
+
+ $critera_z = new CriteriaCompo(new Criteria('dom_catid', XOOPS_DOMAIN));
+ $critera_z->add(new Criteria('dom_name', 'domain')) ;
+ $domains = $domains_handler->getDomains($critera_z);
+
+ $domain_list['all'] = _AM_ALLDOMAINS;
+ foreach($domains as $domain)
+ $domain_list[$domain->getVar('dom_value')] = $domain->getVar('dom_value');
+
+ $selmod = isset($_GET['selmod']) ? intval($_GET['selmod']) : -1;
+ $selgen = isset($_GET['selgen']) ? intval($_GET['selgen']) : 1;
+ $selvis = isset($_GET['selvis']) ? intval($_GET['selvis']) : -1;
+ $selgrp = isset($_GET['selgrp']) ? intval($_GET['selgrp']) : XOOPS_GROUP_USERS;
+ $seldom = isset($_GET['seldom']) ? intval($_GET['seldom']) : 'all';
+
+ echo "<h4>"._AM_BADMIN."</h4>";
+
+ // For selection of generated by
+ echo '<form action="admin.php" method="get">';
+ $form = "<select size=\"1\" name=\"selgen\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selmod=$selmod&selvis=$selvis&selgrp=$selgrp&selgen='+this.options[this.selectedIndex].value\">";
+ $generator_list[-1] = _AM_TYPES;
+ ksort($generator_list);
+ foreach ($generator_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $selgen ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> ';
+ printf(_AM_GENERATOR, $form);
+
+ // For selection of visible in
+ $form = "<select size=\"1\" name=\"seldom\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selvis=$selvis&selgrp=$selgrp&selmod=$selmod&seldom='+this.options[this.selectedIndex].value\">";
+ //$toponlyblock = false;
+ foreach ($domain_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $seldom ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> '; // <input type="hidden" name="fct" value="blocksadmin" />';
+ printf(_AM_DOMAINSINSEL, $form);
+
+ // For selection of visible in
+ $form = "<select size=\"1\" name=\"selmod\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&seldom=$seldom&selvis=$selvis&selgrp=$selgrp&selmod='+this.options[this.selectedIndex].value\">";
+ //$toponlyblock = false;
+ ksort($display_list);
+ $display_list_spec[-2] = _AM_TYPES;
+ $display_list_spec[0] = _AM_ALLPAGES;
+ $display_list_spec[-1] = _AM_TOPPAGE;
+ $display_list = $display_list_spec + $display_list;
+ foreach ($display_list as $k => $v) {
+ $form .= '<option value="'.$k.'"' . ($k == $selmod ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $form .= '</select> '; // <input type="hidden" name="fct" value="blocksadmin" />';
+ printf(_AM_SVISIBLEIN, $form);
+ unset($display_list[-2]);
+
+ // For selection of group access
+ $member_handler =& xoops_gethandler('member');
+ $group_list = $member_handler->getGroupList();
+ $group_sel = _AM_GROUP." <select size=\"1\" name=\"selgrp\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selvis=$selvis&seldom=$seldom&selmod=$selmod&selgrp='+this.options[this.selectedIndex].value\">";
+ $group_list[0] = _AM_UNASSIGNED;
+ $group_list[-1] = _AM_TYPES;
+ foreach ($group_list as $k => $v) {
+ $group_sel .= '<option value="'.$k.'"' . ($k == $selgrp ? ' selected="selected"' : '') . '>'.$v.'</option>';
+ }
+ $group_sel .= '</select> ';
+ echo $group_sel;
+
+ // For selection of visiblility
+ echo _AM_VISIBLE." <select size=\"1\" name=\"selvis\" "location='".XOOPS_URL."/modules/multisite/admin.php?fct=blocksadmin&selgen=$selgen&selmod=$selmod&seldom=$seldom&selgrp=$selgrp&selvis='+this.options[this.selectedIndex].value\">";
+ echo '<option value="0"' . ($selvis == 0 ? ' selected="selected"' : '') . '>'._NO.'</option>';
+ echo '<option value="1"' . ($selvis == 1 ? ' selected="selected"' : '') . '>'._YES.'</option>';
+ echo '<option value="-1"' . ($selvis == -1 ? ' selected="selected"' : '') . '>'._AM_TYPES.'</option>';
+ echo '</select> <input type="hidden" name="fct" value="blocksadmin" /><input type="submit" value="'._GO.'" name="selsubmit" />';
+ echo '</form><br />';
+
+ echo "<form action='admin.php' name='blockadmin' method='post'>
+ <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
+ <tr valign='middle' align='center'>
+ <th width='15%'>"._AM_TITLE."</th>
+ <th width='20%'>"._AM_BLKDESC."</th>
+ <th width='10%'>"._AM_MODULE."</th>
+ <th width='10%' nowrap='nowrap'>"._AM_SIDE."<br />"._LEFT."-"._CENTER."-"._RIGHT."</th>
+ <th width='10%'>"._AM_VISIBLEIN."</th>
+ <th width='10%'>"._AM_DOMAINSIN."</th>
+ <th width='10%'>"._AM_BCACHETIME."</th>
+ <th width='10%'>"._AM_VISIBLE."</th>
+ <th width='10%'>"._AM_WEIGHT."</th>
+ <th>"._AM_ACTION."</th>
+ </tr>
+ ";
+ if ($selvis == -1) {
+ //$selvis = null;
+ }
+
+ $order_block = ( isset($selvis) ? "" : "b.visible DESC, " ) . "b.side,b.weight,b.bid";
+ $vis_block = ( $selvis == -1 ) ? null : $selvis;
+ $mod_block = ( $selmod == -2 ) ? null : $selmod;
+ if ($selgrp == 0) {
+ // get blocks that are not assigned to any groups
+ $block_arr = MultisiteBlock::getNonGroupedBlocks($mod_block, $toponlyblock = false, $vis_block, $order_block. true, false);
+ } else {
+ $grp_block = ( $selgrp == -1 ) ? null : $selgrp;
+ $block_arr = MultisiteBlock::getAllByGroupModule($grp_block, $mod_block, $toponlyblock = false, $vis_block, $order_block, true, false);
+ }
+ if ($selgen >= 0) {
+ foreach (array_keys($block_arr) as $bid) {
+ if ($block_arr[$bid]->getVar("mid") != $selgen) {
+ unset($block_arr[$bid]);
+ }
+ }
+ }
+ if ($seldom != 'all') {
+ foreach (array_keys($block_arr) as $bid) {
+ if (!in_array($seldom,explode('|',$block_arr[$bid]->getVar("domains")))) {
+ unset($block_arr[$bid]);
+ }
+ }
+ }
+ //xoops_result(array_keys($block_arr));
+ $block_count = count($block_arr);
+ $class = 'even';
+
+ $block_mod = array();
+ if ($block_count) {
+ $sql = 'SELECT block_id, module_id FROM '.$xoopsDB->prefix('block_module_link').' WHERE block_id IN (' . implode(', ', array_keys($block_arr)) . ')';
+ $result = $xoopsDB->query($sql);
+ while ($row = $xoopsDB->fetchArray($result)) {
+ $block_mod[$row['block_id']][] = $row['module_id'];
+ }
+ }
+
+ $bcachetime = array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH) ;
+
+ foreach (array_keys($block_arr) as $i) {
+ $module_options = '';
+ foreach ( $display_list as $key => $mod ) {
+ if ( !empty($block_mod[$i]) && in_array($key, $block_mod[$i]) ) {
+ $module_options .= "<option value='$key' selected='selected'>$mod</a>" ;
+ } else {
+ $module_options .= "<option value='$key'>$mod</a>" ;
+ }
+ }
+
+ $domain_options = '';
+ foreach ( $domain_list as $key => $mod ) {
+ if ( strpos(' '.$block_arr[$i]->getVar('domains'),$key) ) {
+ $domain_options .= "<option value='$key' selected='selected'>$mod</a>" ;
+ } else {
+ $domain_options .= "<option value='$key'>$mod</a>" ;
+ }
+ }
+ $cachetime_options = '';
+ foreach ( $bcachetime as $key => $cachetime ) {
+ if ( $key == $block_arr[$i]->getVar('bcachetime') ) {
+ $cachetime_options .= "<option value='$key' selected='selected'>$cachetime</option>";
+ } else {
+ $cachetime_options .= "<option value='$key'>$cachetime</option>";
+ }
+
+ }
+
+ $sel0 = $sel1 = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = $ssel5 = $ssel6 = $ssel7 = "";
+ if ( $block_arr[$i]->getVar("visible") == 1 ) {
+ $sel1 = " checked='checked'";
+ } else {
+ $sel0 = " checked='checked'";
+ }
+ if ( $block_arr[$i]->getVar("side") == XOOPS_SIDEBLOCK_LEFT) {
+ $ssel0 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_SIDEBLOCK_RIGHT ) {
+ $ssel1 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_LEFT ) {
+ $ssel2 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_RIGHT ) {
+ $ssel4 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_CENTER ) {
+ $ssel3 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOMLEFT ) {
+ $ssel5 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOMRIGHT ) {
+ $ssel6 = " checked='checked'";
+ } elseif ( $block_arr[$i]->getVar("side") == XOOPS_CENTERBLOCK_BOTTOM ) {
+ $ssel7 = " checked='checked'";
+ }
+ $title = $block_arr[$i]->getVar("title");
+ $name = $block_arr[$i]->getVar("name");
+ echo "<tr valign='top'>
+ <td class='$class'><input type='text' name=title[$i] value='".$title."' size='30' /></td>
+ <td class='$class'>".$name."</td>
+ <td class='$class'>".$generator_list[$block_arr[$i]->getVar('mid')]."</td>
+ <td class='$class' align='center' nowrap='nowrap'>
+ <div align='center' >
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_LEFT."'$ssel2 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_CENTER."'$ssel3 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_RIGHT."'$ssel4 />
+ </div>
+ <div>
+ <span style='float:right'><input type='radio' name='side[$i]' value='".XOOPS_SIDEBLOCK_RIGHT."'$ssel1 /></span>
+ <div align='left'><input type='radio' name='side[$i]' value='".XOOPS_SIDEBLOCK_LEFT."'$ssel0 /></div>
+ </div>
+ <div align='center'>
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOMLEFT."'$ssel5 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOM."'$ssel7 />
+ <input type='radio' name='side[$i]' value='".XOOPS_CENTERBLOCK_BOTTOMRIGHT."'$ssel6 />
+ </div>
+ </td>
+ <td class='$class' align='center'>
+ <select name='bmodule[$i][]' size='5' multiple='multiple'>
+ $module_options
+ </select>
+ </td>
+ <td class='$class' align='center'>
+ <select name='domains[$i][]' size='5' multiple='multiple'>
+ $domain_options
+ </select>
+ </td>
+ <td class='$class' align='center'>
+ <select name='bcachetime[$i]' size='1'>
+ $cachetime_options
+ </select>
+ </td>
+ <td class='$class' align='center' nowrap><input type='radio' name='visible[$i]' value='1'$sel1>"._YES." <input type='radio' name='visible[$i]' value='0'$sel0>"._NO."</td>
+ <td class='$class' align='center'><input type='text' name='weight[$i]' value='".$block_arr[$i]->getVar("weight")."' size='5' maxlength='5' /></td>
+ <td class='$class' align='right'><a href='admin.php?fct=blocksadmin&op=edit&bid=".$block_arr[$i]->getVar("bid")."'>"._EDIT."</a>";
+ echo "<br /><a href='admin.php?fct=blocksadmin&op=clone&bid=".$block_arr[$i]->getVar("bid")."'>"._AM_CLONE."</a>";
+ if ($block_arr[$i]->getVar('block_type') != 'S') {
+ echo "<br /><a href='admin.php?fct=blocksadmin&op=delete&bid=".$block_arr[$i]->getVar("bid")."'>"._DELETE."</a>";
+ }
+ echo "
+ <input type='hidden' name='oldside[$i]' value='".$block_arr[$i]->getVar('side')."' />
+ <input type='hidden' name='oldweight[$i]' value='".$block_arr[$i]->getVar('weight')."' />
+ <input type='hidden' name='oldvisible[$i]' value='".$block_arr[$i]->getVar('visible')."' />
+ <input type='hidden' name='oldbmodule[$i]' value='".@implode(',', $block_mod[$i])."'/>
+ <input type='hidden' name='oldtitle[$i]' value='".$block_arr[$i]->getVar('title')."'/>
+ <input type='hidden' name='oldbcachetime[$i]' value='".$block_arr[$i]->getVar('bcachetime')."'/>
+ <input type='hidden' name='bid[$i]' value='".$i."' />
+ </td></tr>
+ ";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ }
+ echo "<tr><td class='foot' align='center' colspan='10'>
+ <input type='hidden' name='fct' value='blocksadmin' />
+ <input type='hidden' name='op' value='order' />
+ ".$GLOBALS['xoopsSecurity']->getTokenHTML()."
+ <input type='submit' name='submit' value='"._SUBMIT."' />
+ </td></tr></table>
+ </form>
+ <br /><br />";
+
+ $block = array('form_title' => _AM_ADDBLOCK, 'side' => 0, 'weight' => 0, 'visible' => 1, 'title' => '', 'content' => '', 'modules' => array(-1), 'is_custom' => true, 'ctype' => 'H', 'cachetime' => 0, 'op' => 'save', 'edit_form' => false);
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+}
+
+function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bmodule, $bcachetime, $domains)
+{
+ global $xoopsUser;
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $myblock = new MultisiteBlock();
+ $myblock->setVar('side', $bside);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('visible', $bvisible);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('title', $btitle);
+ $myblock->setVar('content', $bcontent);
+ $myblock->setVar('c_type', $bctype);
+ $myblock->setVar('block_type', 'C');
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ switch ($bctype) {
+ case 'H':
+ $name = _AM_CUSTOMHTML;
+ break;
+ case 'P':
+ $name = _AM_CUSTOMPHP;
+ break;
+ case 'S':
+ $name = _AM_CUSTOMSMILE;
+ break;
+ default:
+ $name = _AM_CUSTOMNOSMILE;
+ break;
+ }
+ $myblock->setVar('name', $name);
+ $newid = $myblock->store();
+ if (!$newid) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $myblock->getHtmlErrors();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $db =& Database::getInstance();
+ foreach ($bmodule as $bmid) {
+ $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.intval($bmid).')';
+ $db->query($sql);
+ }
+ $groups = array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS);
+ $count = count($groups);
+ for ($i = 0; $i < $count; $i++) {
+ $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_name, gperm_modid) VALUES (".$groups[$i].", ".$newid.", 'block_read', 1)";
+ $db->query($sql);
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+ exit();
+}
+
+function edit_block($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ $db =& Database::getInstance();
+ $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
+ $result = $db->query($sql);
+ $modules = array();
+ while ($row = $db->fetchArray($result)) {
+ $modules[] = intval($row['module_id']);
+ }
+ $is_custom = $myblock->isCustom();
+ $block = array('form_title' => _AM_EDITBLOCK, 'name' => $myblock->getVar('name'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'title' => $myblock->getVar('title', 'E'), 'content' => $myblock->getVar('content', 'E'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'update', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'domains' => $myblock->getVar('domains'));
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_EDITBLOCK.'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+}
+
+function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $domains, $options=array())
+{
+ global $xoopsConfig;
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ $myblock = new MultisiteBlock($bid);
+ $myblock->setVar('side', $bside);
+ $myblock->setVar('weight', $bweight);
+ $myblock->setVar('visible', $bvisible);
+ $myblock->setVar('title', $btitle);
+ $myblock->setVar('content', $bcontent);
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ if (isset($options)) {
+ $options_count = count($options);
+ if ($options_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $options_count; $i++ ) {
+ if (is_array($options[$i])) {
+ $options[$i] = implode(',', $options[$i]);
+ }
+ }
+ $options = implode('|', $options);
+ $myblock->setVar('options', $options);
+ }
+ }
+ if ($myblock->isCustom()) {
+ switch ($bctype) {
+ case 'H':
+ $name = _AM_CUSTOMHTML;
+ break;
+ case 'P':
+ $name = _AM_CUSTOMPHP;
+ break;
+ case 'S':
+ $name = _AM_CUSTOMSMILE;
+ break;
+ default:
+ $name = _AM_CUSTOMNOSMILE;
+ break;
+ }
+ $myblock->setVar('name', $name);
+ $myblock->setVar('c_type', $bctype);
+ } else {
+ $myblock->setVar('c_type', 'H');
+ }
+ $msg = _AM_DBUPDATED;
+ if ($myblock->store() != false) {
+ $db =& Database::getInstance();
+ $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
+ $db->query($sql);
+ foreach ($bmodule as $bmid) {
+ $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $db->prefix('block_module_link'), $bid, intval($bmid));
+ $db->query($sql);
+ }
+ include_once XOOPS_ROOT_PATH.'/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+ $xoopsTpl->xoops_setCaching(2);
+ if ($myblock->getVar('template') != '') {
+ if ($xoopsTpl->is_cached('db:'.$myblock->getVar('template'), 'blk_'.$myblock->getVar('bid'))) {
+ if (!$xoopsTpl->clear_cache('db:'.$myblock->getVar('template'), 'blk_'.$myblock->getVar('bid'))) {
+ $msg = 'Unable to clear cache for block ID '.$bid;
+ }
+ }
+ } else {
+ if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) {
+ if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'blk_'.$bid)) {
+ $msg = 'Unable to clear cache for block ID '.$bid;
+ }
+ }
+ }
+ } else {
+ $msg = 'Failed update of block. ID:'.$bid;
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,$msg);
+ exit();
+}
+
+function delete_block($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ if ( $myblock->getVar('block_type') == 'S' ) {
+ $message = _AM_SYSTEMCANT;
+ redirect_header('admin.php?fct=blocksadmin',4,$message);
+ exit();
+ } elseif ($myblock->getVar('block_type') == 'M') {
+ // Fix for duplicated blocks created in 2.0.9 module update
+ // A module block can be deleted if there is more than 1 that
+ // has the same func_num/show_func which is mostly likely
+ // be the one that was duplicated in 2.0.9
+ if (1 >= $count = MultisiteBlock::countSimilarBlocks($myblock->getVar('mid'), $myblock->getVar('func_num'), $myblock->getVar('show_func'))) {
+ $message = _AM_MODULECANT;
+ redirect_header('admin.php?fct=blocksadmin',4,$message);
+ exit();
+ }
+ }
+ xoops_confirm(array('fct' => 'blocksadmin', 'op' => 'delete_ok', 'bid' => $myblock->getVar('bid')), 'admin.php', sprintf(_AM_RUSUREDEL,$myblock->getVar('title')));
+}
+
+function delete_block_ok($bid)
+{
+ $myblock = new MultisiteBlock($bid);
+ $myblock->delete();
+ if ($myblock->getVar('template') != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $bid);
+ if (count($btemplate) > 0) {
+ $tplfile_handler->delete($btemplate[0]);
+ }
+ }
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+ exit();
+}
+
+function order_block($bid, $weight, $visible, $side , $title, $bmodule, $bcachetime, $domains)
+{
+ $myblock = new MultisiteBlock($bid);
+ $myblock->setVar('title', $title);
+ $myblock->setVar('weight', $weight);
+ $myblock->setVar('visible', $visible);
+ $myblock->setVar('side', $side);
+ $myblock->setVar('bcachetime', $bcachetime);
+
+ if (isset($domains)) {
+ $domains_count = count($domains);
+ if ($domains_count > 0) {
+ //Convert array values to comma-separated
+ for ( $i = 0; $i < $domains_count; $i++ ) {
+ if (is_array($domains[$i])) {
+ $domains[$i] = implode(',', $domains[$i]);
+ }
+ }
+ $domains = implode('|', $domains);
+ $myblock->setVar('domains', '|'.$domains);
+ }
+ }
+
+ $myblock->store();
+
+ $db =& Database::getInstance();
+ $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
+ $db->queryF($sql);
+
+ foreach ( $bmodule as $bmid ) {
+ $sql = sprintf("INSERT INTO %s (block_id, module_id) VALUES (%u, %d)", $db->prefix('block_module_link'), $bid, intval($bmid));
+ $db->queryF($sql);
+ }
+}
+
+function clone_block($bid)
+{
+ global $xoopsConfig;
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $myblock = new MultisiteBlock($bid);
+ $db =& Database::getInstance();
+ $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . intval($bid);
+ $result = $db->query($sql);
+ $modules = array();
+ while ($row = $db->fetchArray($result)) {
+ $modules[] = intval($row['module_id']);
+ }
+ $is_custom = $myblock->isCustom();
+ $block = array('form_title' => _AM_CLONEBLOCK, 'name' => $myblock->getVar('name'), 'title' => $myblock->getVar('title'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'content' => $myblock->getVar('content', 'N'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'clone_ok', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'domains' => $myblock->getVar('domains'));
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '._AM_CLONEBLOCK.'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+function clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $domains, $options = array())
+{
+ global $xoopsUser;
+ /*
+ if (empty($bmodule)) {
+ xoops_cp_header();
+ adminMenu(0);
+ xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ */
+ $block = new MultisiteBlock($bid);
+ $clone =& $block->xoopsClone();
+ $clone->setVar('side', $bside);
+ $clone->setVar('weight', $bweight);
+ $clone->setVar('visible', $bvisible);
+ $clone->setVar('content', $bcontent);
+ $clone->setVar('title', $btitle);
+ $clone->setVar('bcachetime', $bcachetime);
+
+ if ( isset($domains) ) {
+ if ( is_array($domains) )
+ $domains = implode('|', $domains);
+ $clone->setVar('options', '|'.$domains);
+ }
+
+ if ( isset($options) && (count($options) > 0) ) {
+ $options = implode('|', $options);
+ $clone->setVar('options', $options);
+ }
+ $clone->setVar('bid', 0);
+ // Custom block
+ if ($block->isCustom()) {
+ $clone->setVar('block_type', 'C');
+ // Clone of system or module block
+ } else {
+ $clone->setVar('block_type', 'D');
+ }
+ $newid = $clone->store();
+ if (!$newid) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $clone->getHtmlErrors();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+ }
+ if ($clone->getVar('template') != '') {
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $bid);
+ if (count($btemplate) > 0) {
+ $tplclone =& $btemplate[0]->xoopsClone();
+ $tplclone->setVar('tpl_id', 0);
+ $tplclone->setVar('tpl_refid', $newid);
+ $tplfile_handler->insert($tplclone);
+ }
+ }
+ $db =& Database::getInstance();
+ foreach ( @$bmodule as $bmid ) {
+ $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
+ $db->query($sql);
+ }
+
+ $sql = "SELECT gperm_groupid FROM ".$db->prefix('group_permission')." WHERE gperm_name='block_read' AND gperm_modid='1' AND gperm_itemid='$bid'" ;
+ $result = $db->query($sql);
+ while( list( $gid ) = $db->fetchRow( $result ) ) {
+ $sql = "INSERT INTO ".$db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $newid, 1, 'block_read')";
+ $db->query($sql);
+ }
+
+ redirect_header('admin.php?fct=blocksadmin&t='.time(),1,_AM_DBUPDATED);
+}
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/index.html
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/index.html (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/index.html 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/main.php
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/main.php (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/main.php 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1,221 @@
+<?php
+// $Id: main.php 1446 2008-04-17 14:43:45Z phppp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ exit("Access Denied");
+}
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include XOOPS_ROOT_PATH."/modules/multisite/admin/blocksadmin/blocksadmin.php";
+
+$op = "list";
+if ( isset($_POST) ) {
+ foreach ( $_POST as $k => $v ) {
+ $$k = $v;
+ }
+}
+
+if ( isset($_GET['op']) ) {
+ if ($_GET['op'] == "edit" || $_GET['op'] == "delete" || $_GET['op'] == "delete_ok" || $_GET['op'] == "clone") {
+ $op = $_GET['op'];
+ $bid = isset($_GET['bid']) ? intval($_GET['bid']) : 0;
+ }
+}
+
+if (isset($previewblock)) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ include_once XOOPS_ROOT_PATH.'/class/template.php';
+ $xoopsTpl = new XoopsTpl();
+ $xoopsTpl->xoops_setCaching(0);
+ if (isset($bid)) {
+ $block['bid'] = $bid;
+ $block['form_title'] = _AM_EDITBLOCK;
+ $myblock = new XoopsBlock($bid);
+ $block['name'] = $myblock->getVar('name');
+ } else {
+ if ($op == 'save') {
+ $block['form_title'] = _AM_ADDBLOCK;
+ } else {
+ $block['form_title'] = _AM_CLONEBLOCK;
+ }
+ $myblock = new XoopsBlock();
+ $myblock->setVar('block_type', 'C');
+ }
+ $myts =& MyTextSanitizer::getInstance();
+ $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
+ $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
+ $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.$xoopsConfig['sitename'].'</title><link rel="stylesheet" type="text/css" media="all" href="'.xoops_getcss($xoopsConfig['theme_set']).'" /></head><body><table><tr><th>'.$myblock->getVar('title').'</th></tr><tr><td>'.$myblock->getContent('S', $bctype).'</td></tr></table></body></html>';
+
+ $block['edit_form'] = false;
+ $block['template'] = '';
+ $block['op'] = $op;
+ $block['side'] = $bside;
+ $block['weight'] = $bweight;
+ $block['visible'] = $bvisible;
+ $block['title'] = $myblock->getVar('title', 'E');
+ $block['content'] = $myblock->getVar('content', 'E');
+ $block['modules'] =& $bmodule;
+ $block['domains'] =& $domains;
+ $block['ctype'] = isset($bctype) ? $bctype : $myblock->getVar('c_type');
+ $block['is_custom'] = true;
+ $block['cachetime'] = intval($bcachetime);
+ echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a> <span style="font-weight:bold;">»»</span> '.$block['form_title'].'<br /><br />';
+ include XOOPS_ROOT_PATH.'/modules/multisite/admin/blocksadmin/blockform.php';
+ $form->display();
+ footer_adminMenu();
+ xoops_cp_footer();
+ echo '<script type="text/javascript">
+ <!--//
+ win = openWithSelfMain("", "popup", 250, 200, true);
+ win.document.clear();
+ ';
+ $lines = preg_split("/(\r\n|\r|\n)( *)/", $dummyhtml);
+ foreach ($lines as $line) {
+ echo 'win.document.writeln("'.str_replace('"', '\"', $line).'");';
+ }
+ echo '
+ win.focus();
+ win.document.close();
+ //-->
+ </script>';
+ exit();
+}
+
+if ( $op == "list" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ list_blocks();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ( $op == "order" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $key = 0 ;
+ $tmpoldbmodule = array();
+ foreach ( $oldbmodule as $key => $eachBmodule ) {
+ $tmpoldbmodule[$key] = @explode(',', $eachBmodule);
+ }
+ unset($oldbmodule);
+ $oldbmodule = $tmpoldbmodule;
+ unset($tmpoldbmodule);
+
+ foreach (array_keys($bid) as $i) {
+ $isChange = 0 ;
+ $list = array('title', 'weight', 'visible', 'side', 'bcachetime', 'bmodule', 'domains');
+ foreach ($list as $each) {
+ if ( is_array(${$each}[$i]) ) {
+ if ( count(${$each}[$i]) != count(${'old'.$each}[$i]) ) {
+ $isChange = 1;
+ } elseif ( array_diff(${$each}[$i], ${'old'.$each}[$i]) ) {
+ $isChange = 1;
+ }
+ } elseif ( trim(${'old'.$each}[$i]) != trim(${$each}[$i]) ) {
+ $isChange = 1;
+ }
+ }
+ if ( $isChange == 1 ) {
+ order_block($bid[$i], $weight[$i], $visible[$i], $side[$i], $title[$i], $bmodule[$i], $bcachetime[$i], $domains[$i]);
+ }
+ }
+ redirect_header("admin.php?fct=blocksadmin", 1, _AM_DBUPDATED);
+ exit();
+}
+
+if ( $op == "save" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bmodule, $bcachetime, $domains);
+ exit();
+}
+
+if ( $op == "update" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ $bcachetime = isset($bcachetime) ? intval($bcachetime) : 0;
+ $options = isset($options) ? $options : array();
+ $bcontent = isset($bcontent) ? $bcontent : '';
+ $bctype = isset($bctype) ? $bctype : '';
+ update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $domains, $options);
+}
+
+
+if ( $op == "delete_ok" ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+ delete_block_ok($bid);
+ exit();
+}
+
+if ( $op == "delete" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ delete_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ( $op == "edit" ) {
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ edit_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
+}
+
+if ($op == 'clone') {
+ clone_block($bid);
+}
+
+if ($op == 'clone_ok') {
+ $options = isset($options) ? $options : array();
+ $bcontent = isset($bcontent) ? $bcontent : '';
+ clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $domains, $options);
+}
+
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/xoops_version.php
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/xoops_version.php (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/blocksadmin/xoops_version.php 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1,44 @@
+<?php
+// $Id: xoops_version.php 2 2005-11-02 18:23:29Z skalpa $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+$modversion['name'] = _MD_AM_BKAD;
+$modversion['version'] = "";
+$modversion['description'] = "Side Blocks Administration";
+$modversion['author'] = "";
+$modversion['credits'] = "The MPN SE Project";
+$modversion['help'] = "blocks.html";
+$modversion['license'] = "GPL see LICENSE";
+$modversion['official'] = 1;
+$modversion['image'] = "blocksadmin.gif";
+$modversion['hasAdmin'] = 1;
+$modversion['adminpath'] = "admin.php?fct=blocksadmin";
+$modversion['category'] = XOOPS_MULTISITE_BLOCK;
+?>
\ No newline at end of file
Added: XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/domainsadmin.php
===================================================================
--- XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/domainsadmin.php (rev 0)
+++ XoopsModules/multisite/releases/1.17 RC/admin/domainsadmin/domainsadmin.php 2009-03-21 09:29:50 UTC (rev 3048)
@@ -0,0 +1,341 @@
+<?php
+// $Id: modulesadmin.php 2701 2009-01-20 23:45:46Z dugris $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. ...
[truncated message content] |
|
From: <wis...@us...> - 2009-03-21 09:18:35
|
Revision: 3047
http://xoops.svn.sourceforge.net/xoops/?rev=3047&view=rev
Author: wishcraft
Date: 2009-03-21 09:18:27 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Multisite 1.17 RC First release
Modified Paths:
--------------
XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/main.php
XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/xoops_version.php
XoopsModules/multisite/trunk/modules/multisite/admin/menu.php
XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/main.php
XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/main.php
XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/policiesadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/xoops_version.php
XoopsModules/multisite/trunk/modules/multisite/admin/preferences/main.php
XoopsModules/multisite/trunk/modules/multisite/admin.php
XoopsModules/multisite/trunk/modules/multisite/class/domain.php
XoopsModules/multisite/trunk/modules/multisite/constants.php
XoopsModules/multisite/trunk/modules/multisite/language/english/modinfo.php
XoopsModules/multisite/trunk/modules/multisite/menu.php
XoopsModules/multisite/trunk/modules/multisite/xoops_version.php
Added Paths:
-----------
XoopsModules/multisite/trunk/modules/multisite/blocks/multisite_blocks.php
XoopsModules/multisite/trunk/modules/multisite/include/functions.php
XoopsModules/multisite/trunk/modules/multisite/include/index.html
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/blocksadmin.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/comments.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/domainsadmin.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/index.html
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/modulesadmin.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/policiesadmin.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/preferences.php
XoopsModules/multisite/trunk/modules/multisite/language/english/admin/version.php
XoopsModules/multisite/trunk/modules/multisite/language/index.html
XoopsModules/multisite/trunk/modules/multisite/post.load.php
XoopsModules/multisite/trunk/modules/multisite/pre.load.php
XoopsModules/multisite/trunk/modules/multisite/templates/blocks/multisite_block_mainmenu.html
Removed Paths:
-------------
XoopsModules/multisite/trunk/xoops_lib/
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -306,7 +306,7 @@
global $xoopsUser;
if (empty($bmodule)) {
xoops_cp_header();
- adminMenu(0);
+ adminMenu(XOOPS_MULTISITE_BLOCK);
xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
footer_adminMenu();
xoops_cp_footer();
@@ -355,7 +355,7 @@
$newid = $myblock->store();
if (!$newid) {
xoops_cp_header();
- adminMenu(0);
+ adminMenu(XOOPS_MULTISITE_BLOCK);
$myblock->getHtmlErrors();
footer_adminMenu();
xoops_cp_footer();
@@ -398,7 +398,7 @@
global $xoopsConfig;
if (empty($bmodule)) {
xoops_cp_header();
- adminMenu(0);
+ adminMenu(XOOPS_MULTISITE_BLOCK);
xoops_error(sprintf(_AM_NOTSELNG, _AM_VISIBLEIN));
footer_adminMenu();
xoops_cp_footer();
@@ -566,7 +566,7 @@
{
global $xoopsConfig;
xoops_cp_header();
- adminMenu(0);
+ adminMenu(XOOPS_MULTISITE_BLOCK);
$myblock = new MultisiteBlock($bid);
$db =& Database::getInstance();
$sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . intval($bid);
@@ -627,12 +627,12 @@
}
$newid = $clone->store();
if (!$newid) {
- xoops_cp_header();
- adminMenu(0);
- $clone->getHtmlErrors();
- footer_adminMenu();
- xoops_cp_footer();
- exit();
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ $clone->getHtmlErrors();
+ footer_adminMenu();
+ xoops_cp_footer();
+ exit();
}
if ($clone->getVar('template') != '') {
$tplfile_handler =& xoops_gethandler('tplfile');
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/main.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/main.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/main.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -54,8 +54,8 @@
redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
exit();
}
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
include_once XOOPS_ROOT_PATH.'/class/template.php';
$xoopsTpl = new XoopsTpl();
$xoopsTpl->xoops_setCaching(0);
@@ -114,8 +114,8 @@
}
if ( $op == "list" ) {
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
list_blocks();
footer_adminMenu();
xoops_cp_footer();
@@ -191,20 +191,20 @@
}
if ( $op == "delete" ) {
- xoops_cp_header();
- adminMenu(0);
- delete_block($bid);
- footer_adminMenu();
- xoops_cp_footer();
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ delete_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
exit();
}
if ( $op == "edit" ) {
- xoops_cp_header();
- adminMenu(0);
- edit_block($bid);
- footer_adminMenu();
- xoops_cp_footer();
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_BLOCK);
+ edit_block($bid);
+ footer_adminMenu();
+ xoops_cp_footer();
exit();
}
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -182,8 +182,8 @@
include(XOOPS_ROOT_PATH.'/class/xoopsformloader.php');
include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_DOMAINS);
$xl = new XoopsLists;
@@ -235,8 +235,8 @@
$xl = new XoopsLists;
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_DOMAINS);
$module_handler =& xoops_getmodulehandler('module','multisite');
$module =& $module_handler->getByDirname('system');
@@ -258,7 +258,7 @@
$ii++;
$yy = $config->getVar('dom_id');
- $tray[$ii] = new XoopsFormElementTray($config->getVar('dom_value'),' | ');
+ $tray[$ii] = new XoopsFormElementTray($config->getVar('dom_value'),' ');
$critera_x = new CriteriaCompo(new Criteria('dom_pid', $yy));
$critera_x->add(new Criteria('dom_name', 'language')) ;
@@ -307,7 +307,7 @@
$id[$ii] = new XoopsFormHidden("id[$ii]", $yy);
$label_txt = "<a href='".XOOPS_URL."/modules/multisite/admin.php?fct=$fct&op=delete&id=$yy'>Delete</a> | ";
- $label_txt .= "<a href='".XOOPS_URL."/modules/multisite/admin.php?fct=$fct&op=editdomain&id=$yy'>Edit</a> |";
+ $label_txt .= "<a href='".XOOPS_URL."/modules/multisite/admin.php?fct=$fct&op=editdomain&id=$yy'>Edit</a> | ";
$label_txt .= "<a href='".XOOPS_URL."/modules/multisite/admin.php?fct=preferences&domain=".sprintf($sprint,$config->getVar('dom_value'))."'>Preferences</a>";
$label[$ii] = new XoopsFormLabel("", $label_txt);
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/xoops_version.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/xoops_version.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/xoops_version.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -29,7 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-$modversion['name'] = _MD_AM_DAD;
+$modversion['name'] = _MI_MULTISITE_ADMENU4;
$modversion['version'] = "";
$modversion['description'] = "Domains Administration";
$modversion['author'] = "Simon Roberts (www.chronolabs.org.au)";
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/menu.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/menu.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/menu.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -29,15 +29,15 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
global $adminmenu;
-$adminmenu[1]['title'] = _MI_MULTISITE_ADMENU2;
+$adminmenu[1]['title'] = _MI_MULTISITE_ADMENU1;
$adminmenu[1]['link'] = "admin.php?fct=blocksadmin";
-$adminmenu[2]['title'] = _MI_MULTISITE_ADMENU6;
+$adminmenu[2]['title'] = _MI_MULTISITE_ADMENU2;
$adminmenu[2]['link'] = "admin.php?fct=preferences";
-$adminmenu[3]['title'] = _MI_MULTISITE_ADMENU17;
-$adminmenu[3]['link'] = "admin.php?fct=domainsadmin";
-$adminmenu[4]['title'] = _MI_MULTISITE_ADMENU18;
-$adminmenu[4]['link'] = "admin.php?fct=policiesadmin";
+$adminmenu[3]['title'] = _MI_MULTISITE_ADMENU3;
+$adminmenu[3]['link'] = "admin.php?fct=modulesadmin";
+$adminmenu[4]['title'] = _MI_MULTISITE_ADMENU4;
+$adminmenu[4]['link'] = "admin.php?fct=domainsadmin";
$adminmenu[5]['title'] = _MI_MULTISITE_ADMENU5;
-$adminmenu[5]['link'] = "admin.php?fct=modulesadmin";
+$adminmenu[5]['link'] = "admin.php?fct=policiesadmin";
?>
\ No newline at end of file
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/main.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/main.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/main.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -59,7 +59,7 @@
}
if ( $op == "confirm" ) {
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
//OpenTable();
$error = array();
@@ -173,7 +173,7 @@
xoops_load("cpanel", "system");
XoopsSystemCpanel::flush();
}
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
if ( count($ret) > 0 ) {
foreach ($ret as $msg) {
if ($msg != '') {
@@ -194,7 +194,7 @@
$msgs ='<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname').'/'.trim($mod->getInfo('image')).'" alt="" />';
}
$msgs .= '<br /><span style="font-size:smaller;">'.$mod->getVar('name').'</span><br /><br />'._MD_AM_RUSUREINS;
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
xoops_confirm(array('module' => $module, 'op' => 'install_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _MD_AM_INSTALL);
xoops_cp_footer(); footer_adminMenu();
exit();
@@ -206,7 +206,7 @@
// Flush cache files for cpanel GUIs
xoops_load("cpanel", "system");
XoopsSystemCpanel::flush();
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
if (count($ret) > 0) {
foreach ($ret as $msg) {
if ($msg != '') {
@@ -226,7 +226,7 @@
$msgs ='<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname').'/'.trim($mod->getInfo('image')).'" alt="" />';
}
$msgs .= '<br /><span style="font-size:smaller;">'.$mod->getVar('name').'</span><br /><br />'._MD_AM_RUSUREUNINS;
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
xoops_confirm(array('module' => $module, 'op' => 'uninstall_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _YES);
xoops_cp_footer(); footer_adminMenu();
exit();
@@ -238,7 +238,7 @@
// Flush cache files for cpanel GUIs
xoops_load("cpanel", "system");
XoopsSystemCpanel::flush();
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
if (count($ret) > 0) {
foreach ($ret as $msg) {
if ($msg != '') {
@@ -258,7 +258,7 @@
$msgs ='<img src="'.XOOPS_URL.'/modules/'.$mod->getVar('dirname').'/'.trim($mod->getInfo('image')).'" alt="" />';
}
$msgs .= '<br /><span style="font-size:smaller;">'.$mod->getVar('name').'</span><br /><br />'._MD_AM_RUSUREUPD;
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
xoops_confirm(array('dirname' => $module, 'op' => 'update_ok', 'fct' => 'modulesadmin'), 'admin.php', $msgs, _MD_AM_UPDATE);
xoops_cp_footer(); footer_adminMenu();
exit();
@@ -278,7 +278,7 @@
$temp_name = $module->getVar('name');
$module->loadInfoAsVar($dirname);
$module->setVar('name', $temp_name);
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
if (!$module_handler->insert($module)) {
echo '<p>Could not update '.$module->getVar('name').'</p>';
echo "<br /><a href='admin.php?fct=modulesadmin'>"._MD_AM_BTOMADMIN."</a>";
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -36,7 +36,7 @@
function xoops_module_list()
{
- xoops_cp_header(); adminMenu(0);
+ xoops_cp_header(); adminMenu(XOOPS_MULTISITE_MODULE);
echo "
<h4>"._MD_AM_MODADMIN."</h4>
<form action='admin.php' method='post' name='moduleadmin' id='moduleadmin'>
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/main.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/main.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/main.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -70,11 +70,11 @@
if ( $op == "edit")
{
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_POLICIES);
@policy_form($_GET['id'], $op, $_GET['fct']);
- footer_adminMenu();
- xoops_cp_footer();
+ footer_adminMenu();
+ xoops_cp_footer();
exit;
}
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/policiesadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/policiesadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/policiesadmin.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -229,8 +229,8 @@
$xl = new XoopsLists;
- xoops_cp_header();
- adminMenu(0);
+ xoops_cp_header();
+ adminMenu(XOOPS_MULTISITE_POLICIES);
$module_handler =& xoops_getmodulehandler('module','multisite');
$module =& $module_handler->getByDirname('multisite');
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/xoops_version.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/xoops_version.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/policiesadmin/xoops_version.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -29,7 +29,7 @@
// Project: The XOOPS Project //
// ------------------------------------------------------------------------- //
-$modversion['name'] = _MD_AM_PCAD;
+$modversion['name'] = _MI_MULTISITE_ADMENU5;
$modversion['version'] = "";
$modversion['description'] = "Policies Administration";
$modversion['author'] = "Simon Roberts (www.chronolabs.org.au)";
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/preferences/main.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/preferences/main.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/preferences/main.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -38,13 +38,10 @@
${$k} = $v;
}
}
- if (isset($_GET['op'])) {
- $op = trim($_GET['op']);
+ if (isset($_REQUEST['op'])) {
+ $op = trim($_REQUEST['op']);
}
- if (isset($_POST['op'])) {
- $op = trim($_POST['op']);
- }
if (isset($_REQUEST['confcat_id'])) {
$confcat_id = intval($_REQUEST['confcat_id']);
}
@@ -56,8 +53,52 @@
if ($op == 'copycat')
{
xoops_cp_header();
- adminMenu(0);
+
+ $config_handler =& xoops_gethandler('config');
+ $confopt_handler =& xoops_gethandler('configoption');
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('conf_modid', 0));
+ $criteria->add(new Criteria('conf_catid', $confcat_id));
+ $configs = $config_handler->getConfigs($criteria);
+ $domain_handler =& xoops_getmodulehandler('domainitem','multisite');
+ $domainoption_handler =& xoops_getmodulehandler('domainoption','multisite');
+ $dom_catid = (int)$_REQUEST['dom_catid'];
+ $dom_pid = (int)$_REQUEST['dom_id'];
+ foreach ($configs as $config) {
+ $domconf = $domain_handler->create();
+ $domconf->setVar('dom_pid', $dom_pid);
+ $domconf->setVar('dom_modid', $config->getVar('conf_modid'));
+ $domconf->setVar('dom_catid', $dom_catid);
+ $domconf->setVar('dom_name', $config->getVar('conf_name'));
+ $domconf->setVar('dom_title', $config->getVar('conf_title'));
+ $domconf->setVar('dom_value', $config->getVar('conf_value'));
+ $domconf->setVar('dom_desc', $config->getVar('conf_desc'));
+ $domconf->setVar('dom_formtype', $config->getVar('conf_formtype'));
+ $domconf->setVar('dom_valuetype', $config->getVar('conf_valuetype'));
+ $domconf->setVar('dom_order', $config->getVar('conf_order'));
+
+ if(!$domain_handler->insert($domconf))
+ {
+ $msg .= _MD_AM_ERRORCOPY." <strong>".$domconf->getVar('dom_name')."</strong><br/>";
+ } else {
+ $msg .= _MD_AM_SUCCESSCOPY." <strong>".$domconf->getVar('dom_name')."</strong><br/>";
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('conf_id', $config->getVar('conf_id')));
+ $confopts = $confopt_handler->getObjects($criteria);
+ foreach ($confopts as $option)
+ {
+ $doption = $domainoption_handler->create();
+ $doption->setVar('domop_name', $option->getVar('confop_name'));
+ $doption->setVar('domop_value', $option->getVar('confop_value'));
+ $doption->setVar('dom_id', $domconf->getVar('dom_id'));
+ @$domainoption_handler->insert($doption);
+ }
+ }
+ }
+
+ redirect_header(XOOPS_URL."/modules/multisite/admin.php?fct=$fct&op=show&confcat_id=$confcat_id&domain=$domain",1,$msg);
xoops_cp_footer();
exit;
}
@@ -68,7 +109,7 @@
$confcats = $confcat_handler->getObjects();
$catcount = count($confcats);
xoops_cp_header();
- adminMenu(0);
+ adminMenu(XOOPS_MULTISITE_PREF);
echo '<h4>'._MD_AM_SITEPREF_DOMAIN.'</h4><ul>';
error_reporting(E_ALL);
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
@@ -92,6 +133,7 @@
}
if ($op == 'show') {
+ error_reporting(E_ALL);
if (empty($confcat_id)) {
$confcat_id = 1;
}
@@ -100,53 +142,94 @@
if (!is_object($confcat)) {
redirect_header('admin.php?fct=preferences', 1);
}
+
+ $domcat_handler =& xoops_getmodulehandler('domaincategory','multisite');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('domcat_name', $confcat->getVar('confcat_name')));
+ $domcat = $domcat_handler->getObjects($criteria);
+ if($domcat_handler->getCount($criteria)!='0') {
+ $domcat = $domcat[0];
+ } else {
+ $domcat = $domcat_handler->create();
+ $domcat->setVar('domcat_name', $confcat->getVar('confcat_name'));
+ $domcat->setVar('domcat_order', $confcat->getVar('confcat_order'));
+ @$domcat_handler->insert($domcat);
+ }
+
+
+ $purl = parse_url($domain);
+ $domain_handler =& xoops_getmodulehandler('domain','multisite');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('dom_name', 'domain'));
+ $criteria->add(new Criteria('dom_value', $purl['host']));
+
+ if(!$domain_handler->getDomainCount($criteria))
+ {
+ redirect_header('admin.php?fct=domainsadmin', 1);
+ } else {
+ $obj_domain = $domain_handler->getDomains($criteria);
+ $obj_domain = $obj_domain[0];
+ }
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('dom_pid', $obj_domain->getVar('dom_id')));
+ $criteria->add(new Criteria('dom_catid', $domcat->getVar('domcat_id')));
+ if ($domain_handler->getDomainCount($criteria)==0)
+ {
+ xoops_cp_header();
+ xoops_confirm(array('fct' => $fct, 'op' => 'copycat', 'dom_id' => $obj_domain->getVar('dom_id'), 'confcat_id' => $confcat_id, 'dom_catid' => $domcat->getVar('domcat_id'), "domain" => $domain), "admin.php", sprintf(_MD_AM_MESSAGECOPY, $purl['host'], constant($domcat->getVar('domcat_name'))));
+ xoops_cp_footer();
+ exit;
+ }
+
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
$form = new XoopsThemeForm(constant($confcat->getVar('confcat_name')), 'pref_form', 'admin.php?fct=preferences', 'post', true);
$config_handler =& xoops_gethandler('config');
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('conf_modid', 0));
- $criteria->add(new Criteria('conf_catid', $confcat_id));
- $config = $config_handler->getConfigs($criteria);
+ $criteria->add(new Criteria('dom_pid', $obj_domain->getVar('dom_id')));
+ $criteria->add(new Criteria('dom_modid', 0));
+ $criteria->add(new Criteria('dom_catid', $domcat->getVar('domcat_id')));
+ $config = $domain_handler->getDomains($criteria);
$confcount = count($config);
for ($i = 0; $i < $confcount; $i++) {
- $title = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? constant($config[$i]->getVar('conf_title')) : constant($config[$i]->getVar('conf_title')).'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>';
- switch ($config[$i]->getVar('conf_formtype')) {
+ $title = (!defined($config[$i]->getVar('dom_desc')) || constant($config[$i]->getVar('dom_desc')) == '') ? constant($config[$i]->getVar('dom_title')) : constant($config[$i]->getVar('dom_title')).'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('dom_desc')).'</span>';
+ switch ($config[$i]->getVar('dom_formtype')) {
case 'textarea':
$myts =& MyTextSanitizer::getInstance();
- if ($config[$i]->getVar('conf_valuetype') == 'array') {
+ if ($config[$i]->getVar('dom_valuetype') == 'array') {
// this is exceptional.. only when value type is arrayneed a smarter way for this
- $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
+ $ele = ($config[$i]->getVar('dom_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('dom_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('dom_name'), '', 5, 50);
} else {
- $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
+ $ele = new XoopsFormTextArea($title, $config[$i]->getVar('dom_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
}
break;
case 'select':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
+ $options = $domain_handler->getDomainOptions(new Criteria('dom_id', $config[$i]->getVar('dom_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = defined($options[$j]->getVar('domop_value')) ? constant($options[$j]->getVar('domop_value')) : $options[$j]->getVar('domop_value');
+ $optkey = defined($options[$j]->getVar('domop_name')) ? constant($options[$j]->getVar('domop_name')) : $options[$j]->getVar('domop_name');
$ele->addOption($optval, $optkey);
}
break;
case 'select_multi':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput(), 5, true);
+ $options = $domain_handler->getDomainOptions(new Criteria('dom_id', $config[$i]->getVar('dom_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = defined($options[$j]->getVar('domop_value')) ? constant($options[$j]->getVar('domop_value')) : $options[$j]->getVar('domop_value');
+ $optkey = defined($options[$j]->getVar('domop_name')) ? constant($options[$j]->getVar('domop_name')) : $options[$j]->getVar('domop_name');
$ele->addOption($optval, $optkey);
}
break;
case 'yesno':
- $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
+ $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
break;
case 'theme':
case 'theme_multi':
- $ele = ($config[$i]->getVar('conf_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
+ $ele = ($config[$i]->getVar('dom_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput(), 5, true);
require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
$dirlist = XoopsLists::getThemesList();
if (!empty($dirlist)) {
@@ -163,7 +246,7 @@
$form->addElement(new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput()));
break;
case 'tplset':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
$tplset_handler =& xoops_gethandler('tplset');
$tplsetlist = $tplset_handler->getList();
asort($tplsetlist);
@@ -174,19 +257,19 @@
$form->addElement(new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput()));
break;
case 'cpanel':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
xoops_load("cpanel", "system");
$list = XoopsSystemCpanel::getGuis();
$ele->addOptionArray( $list );
break;
case 'timezone':
- $ele = new XoopsFormSelectTimezone($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelectTimezone($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
break;
case 'language':
- $ele = new XoopsFormSelectLang($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelectLang($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
break;
case 'startpage':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
$module_handler =& xoops_getmodulehandler('module','multisite');
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
@@ -195,17 +278,17 @@
$ele->addOptionArray($moduleslist);
break;
case 'group':
- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+ $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('dom_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
break;
case 'group_multi':
- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), true, $config[$i]->getConfValueForOutput(), 5, true);
+ $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('dom_name'), true, $config[$i]->getConfValueForOutput(), 5, true);
break;
// RMV-NOTIFY - added 'user' and 'user_multi'
case 'user':
- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+ $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('dom_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
break;
case 'user_multi':
- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
+ $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('dom_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
break;
case 'module_cache':
$module_handler =& xoops_getmodulehandler('module','multisite');
@@ -216,7 +299,7 @@
$ele = new XoopsFormElementTray($title, '<br />');
foreach (array_keys($modules) as $mid) {
$c_val = isset($currrent_val[$mid]) ? intval($currrent_val[$mid]) : null;
- $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $config[$i]->getVar('conf_name')."[$mid]", $c_val);
+ $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $config[$i]->getVar('dom_name')."[$mid]", $c_val);
$selform->addOptionArray($cache_options);
$ele->addElement($selform);
unset($selform);
@@ -226,198 +309,81 @@
}
break;
case 'site_cache':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('dom_name'), $config[$i]->getConfValueForOutput());
$ele->addOptionArray(array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK));
break;
case 'password':
$myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormPassword($title, $config[$i]->getVar('dom_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
case 'color':
$myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormColorPicker($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormColorPicker($title, $config[$i]->getVar('dom_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
case 'hidden':
$myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormHidden( $config[$i]->getVar('conf_name'), $myts->htmlspecialchars( $config[$i]->getConfValueForOutput() ) );
+ $ele = new XoopsFormHidden( $config[$i]->getVar('dom_name'), $myts->htmlspecialchars( $config[$i]->getConfValueForOutput() ) );
break;
case 'textbox':
default:
$myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+ $ele = new XoopsFormText($title, $config[$i]->getVar('dom_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
break;
}
- $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
+ $hidden = new XoopsFormHidden('dom_ids[]', $config[$i]->getVar('dom_id'));
$form->addElement($ele);
$form->addElement($hidden);
+ $hidden_pid = new XoopsFormHidden('dom_pids[]', $config[$i]->getVar('dom_pid'));
+ $form->addElement($hidden);
unset($ele);
unset($hidden);
}
$form->addElement(new XoopsFormHidden('op', 'save'));
$form->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
xoops_cp_header();
- adminMenu(0);
- echo '<a href="admin.php?fct=preferences">'. _MD_AM_PREFMAIN .'</a> <span style="font-weight:bold;">»»</span> '.constant($confcat->getVar('confcat_name')).'<br /><br />';
+ adminMenu(XOOPS_MULTISITE_PREF);
+ echo '<a href="admin.php?fct=preferences">'. _MD_AM_PREFMAIN .'</a> <span style="font-weight:bold;">»»</span> '.constant($confcat->getVar('confcat_name')).' »» '.$obj_domain->getVar('dom_value').'<br /><br />';
$form->display();
footer_adminMenu();
xoops_cp_footer();
exit();
}
- if ($op == 'showmod') {
- $config_handler =& xoops_gethandler('config');
- $mod = isset($_GET['mod']) ? intval($_GET['mod']) : 0;
- if (empty($mod)) {
- header('Location: admin.php?fct=preferences');
- exit();
- }
- $config = $config_handler->getConfigs(new Criteria('conf_modid', $mod));
- $count = count($config);
- if ($count < 1) {
- redirect_header('admin.php?fct=preferences', 1);
- }
- include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
- $form = new XoopsThemeForm(_MD_AM_MODCONFIG, 'pref_form', 'admin.php?fct=preferences', 'post', true);
- $module_handler =& xoops_getmodulehandler('module','multisite');
- $module =& $module_handler->get($mod);
- if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
- include_once XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
- }
-
- // if has comments feature, need comment lang file
- if ($module->getVar('hascomments') == 1) {
- include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
- }
- // RMV-NOTIFY
- // if has notification feature, need notification lang file
- if ($module->getVar('hasnotification') == 1) {
- include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
- }
-
- $modname = $module->getVar('name');
- if ($module->getInfo('adminindex')) {
- $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
- }
- for ($i = 0; $i < $count; $i++) {
- $title = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? constant($config[$i]->getVar('conf_title')) : constant($config[$i]->getVar('conf_title')).'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>';
- switch ($config[$i]->getVar('conf_formtype')) {
- case 'textarea':
- $myts =& MyTextSanitizer::getInstance();
- if ($config[$i]->getVar('conf_valuetype') == 'array') {
- // this is exceptional.. only when value type is arrayneed a smarter way for this
- $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
- } else {
- $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
- }
- break;
- case 'select':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
- $opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
- $ele->addOption($optval, $optkey);
- }
- break;
- case 'select_multi':
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
- $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
- $opcount = count($options);
- for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
- $ele->addOption($optval, $optkey);
- }
- break;
- case 'yesno':
- $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
- break;
- case 'group':
- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
- break;
- case 'group_multi':
- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
- $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
- break;
- // RMV-NOTIFY: added 'user' and 'user_multi'
- case 'user':
- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
- break;
- case 'user_multi':
- include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
- $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
- break;
- case 'password':
- $myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
- break;
- case 'color':
- $myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormColorPicker($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
- break;
- case 'hidden':
- $myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormHidden( $config[$i]->getVar('conf_name'), $myts->htmlspecialchars( $config[$i]->getConfValueForOutput() ) );
- break;
- case 'textbox':
- default:
- $myts =& MyTextSanitizer::getInstance();
- $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
- break;
- }
- $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
- $form->addElement($ele);
- $form->addElement($hidden);
- unset($ele);
- unset($hidden);
- }
- $form->addElement(new XoopsFormHidden('op', 'save'));
- $form->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
- xoops_cp_header();
- adminMenu(0);
- $form->display();
- footer_adminMenu();
- xoops_cp_footer();
- exit();
- }
-
if ($op == 'save') {
+ $domain_handler =& xoops_getmodulehandler('domain','multisite');
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header("admin.php?fct=preferences", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
require_once(XOOPS_ROOT_PATH.'/class/template.php');
$xoopsTpl = new XoopsTpl();
- $count = count($conf_ids);
+ $count = count($dom_ids);
$tpl_updated = false;
$theme_updated = false;
$startmod_updated = false;
$lang_updated = false;
if ($count > 0) {
for ($i = 0; $i < $count; $i++) {
- $config =& $config_handler->getConfig($conf_ids[$i]);
- $new_value =& ${$config->getVar('conf_name')};
- if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
+ $config =& $domain_handler->getDomain($dom_ids[$i]);
+ $new_value =& ${$config->getVar('dom_name')};
+ if (is_array($new_value) || $new_value != $config->getVar('dom_value')) {
// if language has been changed
- if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
- $xoopsConfig['language'] = ${$config->getVar('conf_name')};
+ if (!$lang_updated && $config->getVar('dom_name') == 'language') {
+ $xoopsConfig['language'] = ${$config->getVar('dom_name')};
$lang_updated = true;
}
// if default theme has been changed
- if (!$theme_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'theme_set') {
+ if (!$theme_updated && $config->getVar('dom_name') == 'theme_set') {
$member_handler =& xoops_gethandler('member');
- $member_handler->updateUsersByField('theme', ${$config->getVar('conf_name')});
+ $member_handler->updateUsersByField('theme', ${$config->getVar('dom_name')});
$theme_updated = true;
}
// if default template set has been changed
- if (!$tpl_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'template_set') {
+ if (!$tpl_updated && $config->getVar('dom_name') == 'template_set') {
// clear cached/compiled files and regenerate them if default theme has been changed
- if ($xoopsConfig['template_set'] != ${$config->getVar('conf_name')}) {
- $newtplset = ${$config->getVar('conf_name')};
+ if ($xoopsConfig['template_set'] != ${$config->getVar('dom_name')}) {
+ $newtplset = ${$config->getVar('dom_name')};
// clear all compiled and cachedfiles
$xoopsTpl->clear_compiled_tpl();
@@ -457,7 +423,7 @@
}
// add read permission for the start module to all groups
- if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
+ if (!$startmod_updated && $new_value != '--' && $config->getVar('dom_name') == 'startpage') {
$member_handler =& xoops_gethandler('member');
$groups = $member_handler->getGroupList();
$moduleperm_handler =& xoops_gethandler('groupperm');
@@ -472,7 +438,7 @@
}
$config->setConfValueForInput($new_value);
- $config_handler->insertConfig($config);
+ $domain_handler->insertDomain($config);
}
unset($new_value);
}
Modified: XoopsModules/multisite/trunk/modules/multisite/admin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/admin.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -41,7 +41,7 @@
include "../../mainfile.php";
include XOOPS_ROOT_PATH."/include/cp_functions.php";
global $xoopsModule;
-include_once XOOPS_PATH."/modules/multisite/include/functions.php";
+include_once XOOPS_ROOT_PATH."/modules/multisite/include/functions.php";
xoops_loadLanguage('admin', 'system');
$admintest = 0;
@@ -59,27 +59,27 @@
}
// include system category definitions
-include_once XOOPS_PATH."/modules/multisite/constants.php";
+include_once XOOPS_ROOT_PATH."/modules/multisite/constants.php";
$error = false;
if ($admintest != 0) {
if (isset($fct) && $fct != '') {
$fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct);
- if (file_exists(XOOPS_PATH."/modules/multisite/admin/".$fct."/xoops_version.php")) {
+ if (file_exists(XOOPS_ROOT_PATH."/modules/multisite/admin/".$fct."/xoops_version.php")) {
- if (file_exists(XOOPS_PATH."/modules/multisite/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
- include XOOPS_PATH."/modules/multisite/language/".$xoopsConfig['language']."/admin/".$fct.".php";
- } elseif (file_exists(XOOPS_PATH."/modules/multisite/language/english/admin/".$fct.".php")) {
- include XOOPS_PATH."/modules/multisite/language/english/admin/".$fct.".php";
+ if (file_exists(XOOPS_ROOT_PATH."/modules/multisite/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/multisite/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+ } elseif (file_exists(XOOPS_ROOT_PATH."/modules/multisite/language/english/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/multisite/language/english/admin/".$fct.".php";
}
- include XOOPS_PATH."/modules/multisite/admin/".$fct."/xoops_version.php";
+ include XOOPS_ROOT_PATH."/modules/multisite/admin/".$fct."/xoops_version.php";
$sysperm_handler =& xoops_gethandler('groupperm');
$category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
unset($modversion);
if ($category > 0) {
$groups = $xoopsUser->getGroups();
if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
- if (file_exists(XOOPS_PATH."/modules/multisite/admin/".$fct."/main.php")) {
- include_once XOOPS_PATH."/modules/multisite/admin/".$fct."/main.php";
+ if (file_exists(XOOPS_ROOT_PATH."/modules/multisite/admin/".$fct."/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/multisite/admin/".$fct."/main.php";
} else {
$error = true;
}
@@ -87,8 +87,8 @@
$error = true;
}
} elseif ($fct == 'version') {
- if (file_exists(XOOPS_PATH."/modules/multisite/admin/version/main.php")) {
- include_once XOOPS_PATH."/modules/multisite/admin/version/main.php";
+ if (file_exists(XOOPS_ROOT_PATH."/modules/multisite/admin/version/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/multisite/admin/version/main.php";
} else {
$error = true;
}
@@ -119,7 +119,7 @@
$all_ok = true;
}
require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
- $admin_dir = XOOPS_PATH."/modules/multisite/admin";
+ $admin_dir = XOOPS_ROOT_PATH."/modules/multisite/admin";
$dirlist = XoopsLists::getDirListAsArray($admin_dir);
$counter = 0;
$class = 'even';
Added: XoopsModules/multisite/trunk/modules/multisite/blocks/multisite_blocks.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/blocks/multisite_blocks.php (rev 0)
+++ XoopsModules/multisite/trunk/modules/multisite/blocks/multisite_blocks.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -0,0 +1,66 @@
+<?php
+// $Id: system_blocks.php 1999 2008-08-30 11:00:39Z phppp $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// You may not change or alter any portion of this comment or credits //
+// of supporting developers from this source code or any supporting //
+// source code which is considered copyrighted (c) material of the //
+// original comment or credit authors. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu) //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+function b_multisite_main_show()
+{
+ global $xoopsUser,$xoopsModule;
+ $block = array();
+ $block['lang_home'] = _MB_SYSTEM_HOME;
+ $block['lang_close'] = _CLOSE;
+ $module_handler =& xoops_gethandler('module');
+ $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+ $criteria->add(new Criteria('isactive', 1));
+ $criteria->add(new Criteria('weight', 0, '>'));
+ $critera_p = new CriteriaCompo(new Criteria('domains', "%|".str_replace("www.","",strtolower($_SERVER['HTTP_HOST'])).'%', 'LIKE'), 'OR');
+ $critera_p->add(new Criteria('domains', "%|all%", 'like')) ;
+ $criteria->add($critera_p);
+ $modules = $module_handler->getObjects($criteria, true);
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+ $read_allowed = $moduleperm_handler->getItemIds('module_read', $groups);
+ foreach (array_keys($modules) as $i) {
+ if (in_array($i, $read_allowed)) {
+ $block['modules'][$i]['name'] = $modules[$i]->getVar('name');
+ $block['modules'][$i]['directory'] = $modules[$i]->getVar('dirname');
+ $sublinks = $modules[$i]->subLink();
+ if ((count($sublinks) > 0) && (!empty($xoopsModule)) && ($i == $xoopsModule->getVar('mid'))) {
+ foreach($sublinks as $sublink){
+ $block['modules'][$i]['sublinks'][] = array('name' => $sublink['name'], 'url' => XOOPS_URL.'/modules/'.$modules[$i]->getVar('dirname').'/'.$sublink['url']);
+ }
+ } else {
+ $block['modules'][$i]['sublinks'] = array();
+ }
+ }
+ }
+ return $block;
+}
+
+?>
\ No newline at end of file
Modified: XoopsModules/multisite/trunk/modules/multisite/class/domain.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/class/domain.php 2009-03-19 10:59:21 UTC (rev 3046)
+++ XoopsModules/multisite/trunk/modules/multisite/class/domain.php 2009-03-21 09:18:27 UTC (rev 3047)
@@ -85,14 +85,32 @@
var $_cacheddomains = array();
/**
+ * holds an id of creferences to domain value arrays,
+ * indexed on module id and category id
+ *
+ * @var array
+ * @access private
+ */
+ var $_domain_id = 0;
+
+ /**
+ * holds an domain object of creferences to domain of XOOPS_URL,
+ * indexed on module id and category id
+ *
+ * @var object
+ * @access private
+ */
+ var $_domain;
+
+ /**
* Constructor
*
* @param object &$db reference to database object
*/
function MultisiteDomainHandler(&$db)
{
- $this->_cHandler = new MultisiteDomainitemHandler($db);
- $this->_oHandler = new MultisiteDomainoptionHandler($db);
+ $this->_cHandler = new MultisiteDomainItemHandler($db);
+ $this->_oHandler = new MultisiteDomainOptionHandler($db);
}
/**
@@ -231,7 +249,79 @@
}
}
+ function set_domain_id($domain)
+ {
+ if (is_a($domain, "MultisiteDomainitem"))
+ {
+ $this->_domain = $domain;
+ $this->_domain_id = $domain->getVar('dom_id');
+ }
+ }
+
+ function get_domain_id($domain)
+ {
+ return $this->_domain_id;
+ }
+
/**
+ * Get domains from a certain category
+ *
+ * @param int $category ID of a category
+ * @param int $module ID of a module
+ *
+ * @return array array of {@link MultisiteDomain}s
+ */
+ function &getConfigByDomainCat($category, $preset, $module=0)
+ {
+
+
+ $confcat_handler =& xoops_gethandler('configcategory');
+ $confcat =& $confcat_handler->get($category);
+
+ $domcat_handler =& xoops_getmodulehandler('domaincategory','multisite');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('domcat_name', $confcat->getVar('confcat_name')));
+ $domcat = $domcat_handler->getObjects($criteria);
+
+ if (is_object($domcat[0]))
+ {
+ $domain_handler =& xoops_getmodulehandler('domain','multisite');
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('dom_pid', $this->_domain_id));
+ $criteria->add(new Criteria('dom_modid', $module));
+ $criteria->add(new Criteria('dom_catid', $domcat[0]->getVar('domcat_id')));
+ if ($domain_handler->getDomainCount($criteria)>0)
+ if (!empty($domc...
[truncated message content] |
|
From: <wis...@us...> - 2009-03-19 10:59:33
|
Revision: 3046
http://xoops.svn.sourceforge.net/xoops/?rev=3046&view=rev
Author: wishcraft
Date: 2009-03-19 10:59:21 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
* Minor Aesthetics footer column span
Modified Paths:
--------------
XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php
XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php 2009-03-19 10:52:08 UTC (rev 3045)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/blocksadmin/blocksadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
@@ -63,7 +63,8 @@
$selgen = isset($_GET['selgen']) ? intval($_GET['selgen']) : 1;
$selvis = isset($_GET['selvis']) ? intval($_GET['selvis']) : -1;
$selgrp = isset($_GET['selgrp']) ? intval($_GET['selgrp']) : XOOPS_GROUP_USERS;
-
+ $seldom = isset($_GET['seldom']) ? intval($_GET['seldom']) : 'all';
+
echo "<h4>"._AM_BADMIN."</h4>";
// For selection of generated by
@@ -157,6 +158,13 @@
}
}
}
+ if ($seldom != 'all') {
+ foreach (array_keys($block_arr) as $bid) {
+ if (!in_array($seldom,explode('|',$block_arr[$bid]->getVar("domains")))) {
+ unset($block_arr[$bid]);
+ }
+ }
+ }
//xoops_result(array_keys($block_arr));
$block_count = count($block_arr);
$class = 'even';
@@ -279,7 +287,7 @@
";
$class = ($class == 'even') ? 'odd' : 'even';
}
- echo "<tr><td class='foot' align='center' colspan='9'>
+ echo "<tr><td class='foot' align='center' colspan='10'>
<input type='hidden' name='fct' value='blocksadmin' />
<input type='hidden' name='op' value='order' />
".$GLOBALS['xoopsSecurity']->getTokenHTML()."
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php 2009-03-19 10:52:08 UTC (rev 3045)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/modulesadmin/modulesadmin.php 2009-03-19 10:59:21 UTC (rev 3046)
@@ -114,7 +114,7 @@
';
$listed_mods[] = $module->getVar('dirname');
}
- echo "<tr class='foot'><td colspan='6' align='center'><input type='hidden' name='fct' value='modulesadmin' />
+ echo "<tr class='foot'><td colspan='7' align='center'><input type='hidden' name='fct' value='modulesadmin' />
<input type='hidden' name='op' value='confirm' />
<input type='submit' name='submit' value='"._MD_AM_SUBMIT."' />
</td></tr></table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wis...@us...> - 2009-03-19 10:52:14
|
Revision: 3045
http://xoops.svn.sourceforge.net/xoops/?rev=3045&view=rev
Author: wishcraft
Date: 2009-03-19 10:52:08 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Multi-site - Final Control Panel Update - domainsadmin.php
Modified Paths:
--------------
XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php
Modified: XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php
===================================================================
--- XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php 2009-03-19 10:48:26 UTC (rev 3044)
+++ XoopsModules/multisite/trunk/modules/multisite/admin/domainsadmin/domainsadmin.php 2009-03-19 10:52:08 UTC (rev 3045)
@@ -270,6 +270,7 @@
$language[$ii] = new XoopsFormSelect(_MD_AM_LANGUAGE, "languages[$ii]", 0, 1 , false);
$language[$ii]->addOptionArray($xl->getLangList());
+ $language[$ii]->setExtra('disabled="1"');
$critera_y = new CriteriaCompo(new Criteria('dom_pid', $yy));
$critera_y->add(new Criteria('dom_name', 'theme')) ;
@@ -280,6 +281,7 @@
else
$themes[$ii] = new XoopsFormSelect(_MD_AM_THEME, "themes[$ii]", 0, 1, false);
$themes[$ii]->addOptionArray($xl->getThemesList());
+ $themes[$ii]->setExtra('disabled="1"');
$critera_z = new CriteriaCompo(new Criteria('dom_pid', $yy));
$critera_z->add(new Criteria('dom_name', 'startpage')) ;
@@ -291,6 +293,7 @@
$startmodule[$ii] = new XoopsFormSelect(_MD_AM_START_MODULE, "start_module[$ii]", 0, 1 , false);
$startmodule[$ii]->addOptionArray(array_merge(array("" => "(none)"),$xl->getModulesList()));
+ $startmodule[$ii]->setExtra('disabled="1"');
$critera_z = new CriteriaCompo(new Criteria('dom_pid', $yy));
$critera_z->add(new Criteria('dom_name', 'sitename')) ;
@@ -300,7 +303,7 @@
$pagetitle[$ii] = new XoopsFormText(_MD_AM_DOMAIN_PAGETITLE, "page_title[$ii]", 23, 255 , $configs_c[0]->getVar('dom_value'));
else
$pagetitle[$ii] = new XoopsFormText(_MD_AM_DOMAIN_PAGETITLE, "page_title[$ii]", 23, 255 , '');
-
+ $pagetitle[$ii]->setExtra('disabled="1"');
$id[$ii] = new XoopsFormHidden("id[$ii]", $yy);
$label_txt = "<a href='".XOOPS_URL."/modules/multisite/admin.php?fct=$fct&op=delete&id=$yy'>Delete</a> | ";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
9 messages has been excluded from this view by a project administrator.