[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: sitemgr/inc class.Block_SO.inc.php,1.2,1.3 class
|
From: |
Michael Totschnig <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: sitemgr/inc class.Block_SO.inc.php,1.2,1.3 class.Content_BO.inc.php,1.1,1.2 class.Content_SO.inc.php,1.4,1.5 class.Content_UI.inc.php,1.1,1.2 class.Modules_BO.inc.php,1.1,1.2 class.Modules_SO.inc.php,1.2,1.3 class.Modules_UI.inc.php,1.1,1.2 class.Translations_UI.inc.php,1.2,1.3 class.module.inc.php,1.5,1.6 |
|
Date: |
Tue, 04 Mar 2003 12:26:46 -0500 |
Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv28077/inc
Modified Files:
class.Block_SO.inc.php class.Content_BO.inc.php
class.Content_SO.inc.php class.Content_UI.inc.php
class.Modules_BO.inc.php class.Modules_SO.inc.php
class.Modules_UI.inc.php class.Translations_UI.inc.php
class.module.inc.php
Log Message:
reorganise place where modules are stored
Index: class.Block_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Block_SO.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Block_SO.inc.php 17 Jan 2003 03:37:52 -0000 1.2
--- class.Block_SO.inc.php 4 Mar 2003 17:26:43 -0000 1.3
***************
*** 7,11 ****
var $area;
var $module_id;
- var $app_name;
var $module_name;
var $arguments;
--- 7,10 ----
Index: class.Content_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_BO.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.Content_BO.inc.php 17 Jan 2003 03:37:52 -0000 1.1
--- class.Content_BO.inc.php 4 Mar 2003 17:26:43 -0000 1.2
***************
*** 31,35 ****
if
($GLOBALS['Common_BO']->acl->can_write_category($block->cat_id) &&
in_array($block->module_id,$permittedmoduleids)
&&
!
$GLOBALS['Common_BO']->modules->createmodule($module['app_name'],$module['module_name']))
{
return $this->so->addblock($block);
--- 31,35 ----
if
($GLOBALS['Common_BO']->acl->can_write_category($block->cat_id) &&
in_array($block->module_id,$permittedmoduleids)
&&
!
$GLOBALS['Common_BO']->modules->createmodule($module['module_name']))
{
return $this->so->addblock($block);
***************
*** 147,151 ****
{
$block = $this->so->getblockdef($blockid);
! return
$GLOBALS['Common_BO']->modules->createmodule($block->app_name,$block->module_name);
}
}
--- 147,151 ----
{
$block = $this->so->getblockdef($blockid);
! return
$GLOBALS['Common_BO']->modules->createmodule($block->module_name);
}
}
Index: class.Content_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_SO.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.Content_SO.inc.php 31 Jan 2003 19:11:28 -0000 1.4
--- class.Content_SO.inc.php 4 Mar 2003 17:26:43 -0000 1.5
***************
*** 41,45 ****
function getblocksforscope($cat_id,$page_id)
{
! $sql = "SELECT
t1.block_id,t1.module_id,app_name,module_name,area FROM phpgw_sitemgr_content
AS t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id = t2.module_id AND cat_id
= $cat_id AND page_id = $page_id ORDER by sort_order";
$block = CreateObject('sitemgr.Block_SO',True);
$result = array();
--- 41,45 ----
function getblocksforscope($cat_id,$page_id)
{
! $sql = "SELECT
t1.block_id,t1.module_id,module_name,area FROM phpgw_sitemgr_content AS
t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id = t2.module_id AND cat_id =
$cat_id AND page_id = $page_id ORDER by sort_order";
$block = CreateObject('sitemgr.Block_SO',True);
$result = array();
***************
*** 51,55 ****
$block->id = $id;
$block->module_id = $this->db->f('module_id');
- $block->app_name = $this->db->f('app_name');
$block->module_name =
$this->db->f('module_name');
$block->area = $this->db->f('area');
--- 51,54 ----
***************
*** 61,65 ****
function getallblocksforarea($area,$cat_list,$page_id,$lang)
{
! $sql = "SELECT t1.block_id, area, cat_id, page_id,
t1.module_id, app_name, module_name, arguments, arguments_lang, sort_order,
title, viewable, actif"
. " FROM phpgw_sitemgr_content AS t1 LEFT JOIN "
. " phpgw_sitemgr_modules AS t2 on
t1.module_id=t2.module_id LEFT JOIN "
--- 60,64 ----
function getallblocksforarea($area,$cat_list,$page_id,$lang)
{
! $sql = "SELECT t1.block_id, area, cat_id, page_id,
t1.module_id, module_name, arguments, arguments_lang, sort_order, title,
viewable, actif"
. " FROM phpgw_sitemgr_content AS t1 LEFT JOIN "
. " phpgw_sitemgr_modules AS t2 on
t1.module_id=t2.module_id LEFT JOIN "
***************
*** 88,92 ****
$block->page_id = $this->db->f('page_id');
$block->module_id = $this->db->f('module_id');
- $block->app_name = $this->db->f('app_name');
$block->module_name =
$this->db->f('module_name');
$block->arguments = array_merge(
--- 87,90 ----
***************
*** 105,109 ****
function getvisibleblockdefsforarea($area,$cat_list,$page_id)
{
! $sql = "SELECT
t1.block_id,area,cat_id,page_id,t1.module_id,app_name,module_name,viewable FROM
phpgw_sitemgr_content AS t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id =
t2.module_id AND area = '$area' AND ((page_id = 0 and cat_id = 0)";
if ($cat_list)
{
--- 103,107 ----
function getvisibleblockdefsforarea($area,$cat_list,$page_id)
{
! $sql = "SELECT
t1.block_id,area,cat_id,page_id,t1.module_id,module_name,viewable FROM
phpgw_sitemgr_content AS t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id =
t2.module_id AND area = '$area' AND ((page_id = 0 and cat_id = 0)";
if ($cat_list)
{
***************
*** 128,132 ****
$block->page_id = $this->db->f('page_id');
$block->module_id = $this->db->f('module_id');
- $block->app_name = $this->db->f('app_name');
$block->module_name =
$this->db->f('module_name');
$block->view = $this->db->f('viewable');
--- 126,129 ----
***************
*** 169,173 ****
function getblock($block_id,$lang)
{
! $sql = "SELECT
t1.block_id,cat_id,page_id,area,t1.module_id,app_name,module_name,arguments,arguments_lang,sort_order,title,viewable,actif
FROM phpgw_sitemgr_modules AS t2, phpgw_sitemgr_content AS t1 LEFT JOIN
phpgw_sitemgr_content_lang as t3 ON (t1.block_id=t3.block_id AND lang='$lang')
WHERE t1.module_id = t2.module_id AND t1.block_id = $block_id";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
--- 166,170 ----
function getblock($block_id,$lang)
{
! $sql = "SELECT
t1.block_id,cat_id,page_id,area,t1.module_id,module_name,arguments,arguments_lang,sort_order,title,viewable,actif
FROM phpgw_sitemgr_modules AS t2, phpgw_sitemgr_content AS t1 LEFT JOIN
phpgw_sitemgr_content_lang as t3 ON (t1.block_id=t3.block_id AND lang='$lang')
WHERE t1.module_id = t2.module_id AND t1.block_id = $block_id";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
***************
*** 179,183 ****
$block->area = $this->db->f('area');
$block->module_id = $this->db->f('module_id');
- $block->app_name = $this->db->f('app_name');
$block->module_name =
$this->db->f('module_name');
$block->arguments = array_merge(
--- 176,179 ----
***************
*** 200,204 ****
function getblockdef($block_id)
{
! $sql = "SELECT
cat_id,page_id,area,t1.module_id,app_name,module_name FROM
phpgw_sitemgr_content AS t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id =
t2.module_id AND t1.block_id = $block_id";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
--- 196,200 ----
function getblockdef($block_id)
{
! $sql = "SELECT
cat_id,page_id,area,t1.module_id,module_name FROM phpgw_sitemgr_content AS
t1,phpgw_sitemgr_modules AS t2 WHERE t1.module_id = t2.module_id AND
t1.block_id = $block_id";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
***************
*** 210,214 ****
$block->area = $this->db->f('area');
$block->module_id = $this->db->f('module_id');
- $block->app_name = $this->db->f('app_name');
$block->module_name =
$this->db->f('module_name');
return $block;
--- 206,209 ----
Index: class.Content_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_UI.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.Content_UI.inc.php 17 Jan 2003 03:37:52 -0000 1.1
--- class.Content_UI.inc.php 4 Mar 2003 17:26:43 -0000 1.2
***************
*** 197,203 ****
//TODO: wrap a module
storage around createmodule as in template3,
//TODO: so that we do
not create the same module object twice
! $moduleobject =
$this->modulebo->createmodule($block->app_name,$block->module_name);
$this->t->set_var(array(
! 'moduleinfo' =>
($block->app_name.'.'.$block->module_name),
'description'
=> $moduleobject->description,
));
--- 197,203 ----
//TODO: wrap a module
storage around createmodule as in template3,
//TODO: so that we do
not create the same module object twice
! $moduleobject =
$this->modulebo->createmodule($block->module_name);
$this->t->set_var(array(
! 'moduleinfo' =>
($block->module_name),
'description'
=> $moduleobject->description,
));
***************
*** 322,326 ****
{
$returnValue.='<option title="' .
$module['description'] . '" value="'.$id.'">'.
! $module['app_name'].'.'.
$module['module_name'].'</option>'."\n";
}
return $returnValue;
--- 322,326 ----
{
$returnValue.='<option title="' .
$module['description'] . '" value="'.$id.'">'.
! $module['module_name'].'</option>'."\n";
}
return $returnValue;
Index: class.Modules_BO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Modules_BO.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.Modules_BO.inc.php 17 Jan 2003 03:37:52 -0000 1.1
--- class.Modules_BO.inc.php 4 Mar 2003 17:26:43 -0000 1.2
***************
*** 13,19 ****
}
! function getmoduleid($appname,$modulename)
{
! return $this->so->getmoduleid($appname,$modulename);
}
--- 13,19 ----
}
! function getmoduleid($modulename)
{
! return $this->so->getmoduleid($modulename);
}
***************
*** 33,41 ****
}
! function createmodule($appname,$modulename)
{
! $class = $appname . '.module_' . $modulename;
! return CreateObject($class);
}
function getallmodules()
--- 33,97 ----
}
!
! //this is identical to CreateObect in
phpgwapi/functions.inc.php, but looks into sitemgr/modules instead of
appname/inc
! function createmodule($modulename)
! {
!
! global $phpgw_info, $phpgw;
!
! //if (is_object(@$GLOBALS['phpgw']->log) && $class !=
'phpgwapi.error' && $class != 'phpgwapi.errorlog')
! //{
! //$GLOBALS['phpgw']->log->write(array('text'=>'D-Debug,
dbg: %1','p1'=>'This class was run:
'.$class,'file'=>__FILE__,'line'=>__LINE__));
! //}
!
! /* error_reporting(0); */
! //list($appname,$classname) = explode(".", $class);
!
! $classname = 'module_' . $modulename;
!
! if
(!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$classname]) ||
!
!$GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
! {
!
if(@file_exists(PHPGW_INCLUDE_ROOT.'/sitemgr/modules/class.'.$classname.'.inc.php'))
! {
!
include(PHPGW_INCLUDE_ROOT.'/sitemgr/modules/class.'.$classname.'.inc.php');
!
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = True;
! }
! else
! {
!
$GLOBALS['phpgw_info']['flags']['included_classes'][$classname] = False;
! }
! }
!
if($GLOBALS['phpgw_info']['flags']['included_classes'][$classname])
{
! if ($p1 == '_UNDEF_' && $p1 != 1)
! {
! eval('$obj = new ' . $classname . ';');
! }
! else
! {
! $input =
array($p1,$p2,$p3,$p4,$p5,$p6,$p7,$p8,$p9,$p10,$p11,$p12,$p13,$p14,$p15,$p16);
! $i = 1;
! $code = '$obj = new ' . $classname . '(';
! while (list($x,$test) = each($input))
! {
! if (($test == '_UNDEF_' && $test != 1 )
|| $i == 17)
! {
! break;
! }
! else
! {
! $code .= '$p' . $i . ',';
! }
! $i++;
! }
! $code = substr($code,0,-1) . ');';
! eval($code);
! }
! /* error_reporting(E_ERROR | E_WARNING | E_PARSE); */
! return $obj;
}
+ }
+
function getallmodules()
***************
*** 43,70 ****
return $this->so->getallmodules();
}
function findmodules()
{
! $appbo = CreateObject('admin.boapplications');
! $app_list = $appbo->get_list();
! while(list($app_name,$app) = each($app_list))
{
! $incdir = PHPGW_SERVER_ROOT . SEP . $app_name .
SEP . 'inc';
! if (is_dir($incdir))
{
! $d = dir(PHPGW_SERVER_ROOT . SEP .
$app_name . SEP . 'inc');
! while ($entry = $d->read())
{
! if (preg_match
("/class\.module_(.*)\.inc\.php$/", $entry, $module))
{
! $modulename =
$module[1];
! $moduleobject =
$this->createmodule($app_name,$modulename);
! if ($moduleobject)
! {
!
$this->so->registermodule($app_name,$modulename,$moduleobject->description);
! }
}
}
- $d->close();
}
}
}
--- 99,122 ----
return $this->so->getallmodules();
}
+
function findmodules()
{
! $incdir = PHPGW_SERVER_ROOT . SEP . 'sitemgr' . SEP .
'modules';
! if (is_dir($incdir))
{
! $d = dir($incdir);
! while ($entry = $d->read())
{
! if (preg_match
("/class\.module_(.*)\.inc\.php$/", $entry, $module))
{
! $modulename = $module[1];
! $moduleobject =
$this->createmodule($modulename);
! if ($moduleobject)
{
!
$this->so->registermodule($modulename,$moduleobject->description);
}
}
}
+ $d->close();
}
}
***************
*** 82,89 ****
//this function looks for a module's configured propertiese for
the combination contentareara,cat_id
! //if module_id is 0 the fourth and fith argument should provide
appname and modulename
! function
getmoduleproperties($module_id,$contentarea,$cat_id,$appname=False,$modulename=False)
{
! return
$this->so->getmoduleproperties($module_id,$contentarea,$cat_id,$appname,$modulename);
}
--- 134,141 ----
//this function looks for a module's configured propertiese for
the combination contentareara,cat_id
! //if module_id is 0 the fourth argument should provide
modulename
! function
getmoduleproperties($module_id,$contentarea,$cat_id,$modulename=False)
{
! return
$this->so->getmoduleproperties($module_id,$contentarea,$cat_id,$modulename);
}
***************
*** 119,123 ****
//this function calculates the properties by climbing up the
hierarchy tree in the same way as
//getcascadingmodulepermissions does
! function
getcascadingmoduleproperties($module_id,$contentarea,$cat_id,$appname=False,$modulename=False)
{
$cat_ancestorlist =
$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id);
--- 171,175 ----
//this function calculates the properties by climbing up the
hierarchy tree in the same way as
//getcascadingmodulepermissions does
! function
getcascadingmoduleproperties($module_id,$contentarea,$cat_id,$modulename=False)
{
$cat_ancestorlist =
$GLOBALS['Common_BO']->cats->getCategoryancestorids($cat_id);
***************
*** 132,136 ****
while($cat_id !== NULL)
{
! $properties =
$this->so->getmoduleproperties($module_id,$contentarea,$cat_id,$appname,$modulename);
//we have to check for type identity
since properties can be NULL in case of unchecked checkbox
if ($properties !== false)
--- 184,188 ----
while($cat_id !== NULL)
{
! $properties =
$this->so->getmoduleproperties($module_id,$contentarea,$cat_id,$modulename);
//we have to check for type identity
since properties can be NULL in case of unchecked checkbox
if ($properties !== false)
Index: class.Modules_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Modules_SO.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Modules_SO.inc.php 28 Jan 2003 20:00:00 -0000 1.2
--- class.Modules_SO.inc.php 4 Mar 2003 17:26:43 -0000 1.3
***************
*** 24,28 ****
}
! function
getmoduleproperties($module_id,$contentarea,$cat_id,$appname,$modulename)
{
if ($module_id)
--- 24,28 ----
}
! function
getmoduleproperties($module_id,$contentarea,$cat_id,$modulename)
{
if ($module_id)
***************
*** 32,36 ****
else
{
! "SELECT properties FROM
phpgw_sitemgr_properties AS t1 LEFT JOIN phpgw_sitemgr_modules AS t2 ON
t1.module_id=t2.module_id WHERE area='$contentarea' AND cat_id = $cat_id AND
app_name = '$appname' and module_name = '$modulename'";
}
$this->db->query($sql,__LINE__,__FILE__);
--- 32,36 ----
else
{
! "SELECT properties FROM
phpgw_sitemgr_properties AS t1 LEFT JOIN phpgw_sitemgr_modules AS t2 ON
t1.module_id=t2.module_id WHERE area='$contentarea' AND cat_id = $cat_id AND
module_name = '$modulename'";
}
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 46,63 ****
}
! function registermodule($app_name,$modulename,$description)
{
$description = $this->db->db_addslashes($description);
! $sql = "SELECT count(*) FROM phpgw_sitemgr_modules
where app_name='$app_name' AND module_name='$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if ($this->db->f(0) == 0)
{
! $sql = "INSERT INTO phpgw_sitemgr_modules
(app_name,module_name,description) VALUES
('$app_name','$modulename','$description')";
$this->db->query($sql,__LINE__,__FILE__);
}
else
{
! $sql = "UPDATE phpgw_sitemgr_modules SET
description = '$description' WHERE app_name='$app_name' AND
module_name='$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
}
--- 46,63 ----
}
! function registermodule($modulename,$description)
{
$description = $this->db->db_addslashes($description);
! $sql = "SELECT count(*) FROM phpgw_sitemgr_modules
where module_name='$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
if ($this->db->f(0) == 0)
{
! $sql = "INSERT INTO phpgw_sitemgr_modules
(module_name,description) VALUES ('$modulename','$description')";
$this->db->query($sql,__LINE__,__FILE__);
}
else
{
! $sql = "UPDATE phpgw_sitemgr_modules SET
description = '$description' WHERE module_name='$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
}
***************
*** 70,76 ****
}
! function getmoduleid($appname,$modulename)
{
! $sql = "SELECT module_id FROM phpgw_sitemgr_modules
WHERE app_name = '$appname' AND module_name = '$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
--- 70,76 ----
}
! function getmoduleid($modulename)
{
! $sql = "SELECT module_id FROM phpgw_sitemgr_modules
WHERE module_name = '$modulename'";
$this->db->query($sql,__LINE__,__FILE__);
if ($this->db->next_record())
***************
*** 88,92 ****
$result['id'] = $this->db->f('module_id');
$result['module_name'] =
$this->db->f('module_name');
- $result['app_name'] = $this->db->f('app_name');
$result['description'] =
stripslashes($this->db->f('description'));
}
--- 88,91 ----
***************
*** 103,107 ****
$id = $this->db->f('module_id');
$result[$id]['module_name'] =
$this->db->f('module_name');
- $result[$id]['app_name'] =
$this->db->f('app_name');
$result[$id]['description'] =
stripslashes($this->db->f('description'));
}
--- 102,105 ----
Index: class.Modules_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Modules_UI.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.Modules_UI.inc.php 17 Jan 2003 03:37:52 -0000 1.1
--- class.Modules_UI.inc.php 4 Mar 2003 17:26:43 -0000 1.2
***************
*** 143,147 ****
$module = $this->bo->getmodule($inputmodule_id);
! $moduleobject =
$this->bo->createmodule($module['app_name'],$module['module_name']);
$blockcontext =
CreateObject('sitemgr.Block_SO',True);
$blockcontext->module_id = $inputmodule_id;
--- 143,147 ----
$module = $this->bo->getmodule($inputmodule_id);
! $moduleobject =
$this->bo->createmodule($module['module_name']);
$blockcontext =
CreateObject('sitemgr.Block_SO',True);
$blockcontext->module_id = $inputmodule_id;
***************
*** 169,173 ****
'module_edit' => lang(
'Edit properties of module %1
for %2 with scope %3',
!
$module['app_name'].'.'.$module['module_name'],
($inputarea == '__PAGE__' ?
'the whole page' : ('Contentarea ' . $inputarea)),
($cat_id ? ('category ' .
$cat_name) : ' the whole site')
--- 169,173 ----
'module_edit' => lang(
'Edit properties of module %1
for %2 with scope %3',
! $module['module_name'],
($inputarea == '__PAGE__' ?
'the whole page' : ('Contentarea ' . $inputarea)),
($cat_id ? ('category ' .
$cat_name) : ' the whole site')
***************
*** 207,211 ****
$selected = (in_array($id,$permitted)) ?
$selected = 'selected="selected" ' : '';
$returnValue.='<option title="' .
$module['description'] . '" ' . $selected . 'value="' .$id . '">' .
! $module['app_name'].'.'.
$module['module_name'].'</option>'."\n";
}
return $returnValue;
--- 207,211 ----
$selected = (in_array($id,$permitted)) ?
$selected = 'selected="selected" ' : '';
$returnValue.='<option title="' .
$module['description'] . '" ' . $selected . 'value="' .$id . '">' .
! $module['module_name'].'</option>'."\n";
}
return $returnValue;
***************
*** 218,222 ****
{
$returnValue.='<option title="' .
$module['description'] . '" value="'.$id.'">'.
! $module['app_name'].'.'.
$module['module_name'].'</option>'."\n";
}
return $returnValue;
--- 218,222 ----
{
$returnValue.='<option title="' .
$module['description'] . '" value="'.$id.'">'.
! $module['module_name'].'</option>'."\n";
}
return $returnValue;
Index: class.Translations_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Translations_UI.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.Translations_UI.inc.php 21 Feb 2003 06:28:53 -0000 1.2
--- class.Translations_UI.inc.php 4 Mar 2003 17:26:43 -0000 1.3
***************
*** 287,292 ****
while (list($id,$block) = @each($blocks))
{
! $moduleobject =
$this->modulebo->createmodule($block->app_name,$block->module_name);
!
$this->t->set_var('moduleinfo',($block->app_name.'.'.$block->module_name));
$savelangdata =
$this->contentbo->getlangblockdata($id,$savelanguage);
--- 287,292 ----
while (list($id,$block) = @each($blocks))
{
! $moduleobject =
$this->modulebo->createmodule($block->module_name);
!
$this->t->set_var('moduleinfo',($block->module_name));
$savelangdata =
$this->contentbo->getlangblockdata($id,$savelanguage);
Index: class.module.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.module.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.module.inc.php 31 Jan 2003 19:14:37 -0000 1.5
--- class.module.inc.php 4 Mar 2003 17:26:43 -0000 1.6
***************
*** 115,119 ****
function find_template_dir()
{
! $templaterootformat =
$GLOBALS['sitemgr_info']['sitemgr-site-dir']. SEP . 'templates' . SEP . '%s' .
SEP . $this->block->app_name . SEP . $this->block->module_name;
$themetemplatedir =
sprintf($templaterootformat,$GLOBALS['sitemgr_info']['themesel']);
if (is_dir($themetemplatedir))
--- 115,119 ----
function find_template_dir()
{
! $templaterootformat =
$GLOBALS['sitemgr_info']['sitemgr-site-dir']. SEP . 'templates' . SEP . '%s' .
SEP . 'modules' . SEP . $this->block->module_name;
$themetemplatedir =
sprintf($templaterootformat,$GLOBALS['sitemgr_info']['themesel']);
if (is_dir($themetemplatedir))
***************
*** 135,139 ****
$this->block->area,
$this->block->cat_id,
- $this->block->app_name,
$this->block->module_name
);
--- 135,138 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: sitemgr/inc class.Block_SO.inc.php,1.2,1.3 class.Content_BO.inc.php,1.1,1.2 class.Content_SO.inc.php,1.4,1.5 class.Content_UI.inc.php,1.1,1.2 class.Modules_BO.inc.php,1.1,1.2 class.Modules_SO.inc.php,1.2,1.3 class.Modules_UI.inc.php,1.1,1.2 class.Translations_UI.inc.php,1.2,1.3 class.module.inc.php,1.5,1.6,
Michael Totschnig <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/setup default_records.inc.php,1.2,1.3 setup.inc.php,1.11,1.12 tables_current.inc.php,1.10,1.11 tables_update.inc.php,1.10,1.11
- Next by Date:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/templates/NukeNews/modules/news newsblock.tpl,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/setup default_records.inc.php,1.2,1.3 setup.inc.php,1.11,1.12 tables_current.inc.php,1.10,1.11 tables_update.inc.php,1.10,1.11
- Next by thread:
[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/templates/NukeNews/modules/news newsblock.tpl,NONE,1.1
- Index(es):