';
+ }
+}
diff --git a/phpgwapi/inc/class.utilities_rssparse.inc.php b/phpgwapi/inc/class.rssparse.inc.php
similarity index 100%
rename from phpgwapi/inc/class.utilities_rssparse.inc.php
rename to phpgwapi/inc/class.rssparse.inc.php
diff --git a/phpgwapi/inc/class.utilities.inc.php b/phpgwapi/inc/class.utilities.inc.php
index 85ff80f774..a8caa0782f 100644
--- a/phpgwapi/inc/class.utilities.inc.php
+++ b/phpgwapi/inc/class.utilities.inc.php
@@ -36,6 +36,7 @@
$phpgw->matrixview = CreateObject("phpgwapi.matrixview");
$phpgw->menutree = CreateObject("phpgwapi.menutree");
$phpgw->sbox = CreateObject("phpgwapi.sbox");
+ $phpgw->sbox = CreateObject("phpgwapi.portalbox");
}
}
?>
diff --git a/phpgwapi/inc/class.utilities_portalbox.inc.php b/phpgwapi/inc/class.utilities_portalbox.inc.php
deleted file mode 100755
index 921ca0f11d..0000000000
--- a/phpgwapi/inc/class.utilities_portalbox.inc.php
+++ /dev/null
@@ -1,155 +0,0 @@
-$var = $value;
-// echo $var." = ".$this->$var." \n";
- }
-
- function getvar($var="") {
- if ($var=="" || !isset($this->$var)) {
- global $phpgw;
- echo 'Programming Error: '.$this->classname().'->getvar('.$var.')! \n';
- $phpgw->common->phpgw_exit();
- }
-//echo "Var = ".$var." \n";
-//echo $var." = ".$this->$var." \n";
- return $this->$var;
- }
-
- /*
- This is the constructor for the object.
- */
- function baseportalbox($title="", $primary="", $secondary="", $tertiary="") {
- $this->setvar("title",$title);
-// echo "After SetVar Title = ".$this->getvar("title")." \n";
- $this->setvar("outerborderwidth",1);
- $this->setvar("titlebgcolor",$primary);
- $this->setvar("innerbgcolor",$secondary);
- $this->setvar("outerbordercolor",$tertiary);
- }
- // Methods
-}
-
-class linkbox extends baseportalbox {
- /*
- Set up the Object. You will notice, we have not reserved
- memory space for variables. In this circumstance it is not necessary.
- */
-
- /*
- This is the constructor for the linkbox. The only thing this does
- is to call the constructor of the parent class. Why? Well, whilst
- PHP manages a certain part of OO, one of the bits it falls down on
- (at the moment) is constructors within sub-classes. So, to
- be sure that the sub-class is instantiated with the constructor of
- the parent class, I simply call the parent constructor. Of course,
- if I then wanted to override any of the values, I could easily do so.
- */
- function linkbox($title="", $primary="", $secondary="", $tertiary="") {
- $this->baseportalbox($title, $primary, $secondary, $tertiary);
- $this->setvar("outerwidth",300);
- $this->setvar("innerwidth",300);
- $this->setvar("width",300);
- }
- /*
- This is the only method within the class. Quite simply, as you can see
- it draws the table(s), placing the required data in the appropriate place.
- */
- function draw() {
- global $phpgw, $phpgw_info;
-
- $p = new Template($phpgw->common->get_tpl_dir('home'));
- $p->set_file(array('portal_main' => 'portal_main.tpl',
- 'portal_linkbox_header' => 'portal_linkbox_header.tpl',
- 'portal_linkbox' => 'portal_linkbox.tpl',
- 'portal_linkbox_footer' => 'portal_linkbox_footer.tpl'));
- $p->set_block('portal_main','portal_linkbox_header','portal_linkbox','portal_linkbox_footer');
-
- $p->set_var('outer_border',$this->getvar('outerborderwidth'));
- $p->set_var('outer_width',$this->getvar('width'));
- $p->set_var('outer_bordercolor',$this->getvar('outerbordercolor'));
- $p->set_var('outer_bgcolor',$this->getvar('titlebgcolor'));
- $p->set_var('title',$this->getvar('title'));
- $p->set_var('inner_width',$this->getvar('width'));
- $p->set_var('inner_bgcolor',$this->getvar('innerbgcolor'));
- $p->set_var('header_background_image',$this->getvar('header_background_image'));
- $p->parse('output','portal_linkbox_header',True);
-
- for ($x = 0; $x < count($this->data); $x++) {
- $p->set_var('link',$this->data[$x][1]);
- $p->set_var('text',$this->data[$x][0]);
- $p->parse('output','portal_linkbox',True);
- }
- $p->parse('output','portal_linkbox_footer',True);
- return $p->parse('out','portal_main');
- }
-}
-
-class resultbox extends baseportalbox {
- /*
- Set up the Object. You will notice, we have not reserved memory
- space for variables. In this circumstance it is not necessary.
- */
-
- //constructor
- function resultbox($title="", $primary="", $secondary="", $tertiary="") {
- $this->baseportalbox($title, $primary, $secondary, $tertiary);
- $this->setvar("outerwidth",400);
- $this->setvar("innerwidth",400);
- }
- /*
- This is the only method within the class. Quite simply, as you can see
- it draws the table(s), placing the required data in the appropriate place.
- */
- function draw() {
- echo '