diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php index aa651be14..07410db18 100644 --- a/inc/inc.ClassSession.php +++ b/inc/inc.ClassSession.php @@ -82,10 +82,10 @@ class SeedDMS_Session { $this->data['clipboard'] = json_decode($resArr[0]['clipboard'], true); else $this->data['clipboard'] = array('docs'=>array(), 'folders'=>array()); - if($resArr[0]['flashmsg']) - $this->data['flashmsg'] = json_decode($resArr[0]['flashmsg'], true); + if($resArr[0]['splashmsg']) + $this->data['splashmsg'] = json_decode($resArr[0]['splashmsg'], true); else - $this->data['flashmsg'] = array(); + $this->data['splashmsg'] = array(); return $resArr[0]; } /* }}} */ @@ -112,7 +112,7 @@ class SeedDMS_Session { $this->data['su'] = 0; $this->data['clipboard'] = array('docs'=>array(), 'folders'=>array()); $this->data['clipboard'] = array('type'=>'', 'msg'=>''); - $this->data['flashmsg'] = array(); + $this->data['splashmsg'] = array(); return $id; } /* }}} */ @@ -308,44 +308,44 @@ class SeedDMS_Session { } /* }}} */ /** - * Set flash message of session + * Set splash message of session * * @param array $msg contains 'typ' and 'msg' */ - function setFlashMsg($msg) { /* {{{ */ + function setSplashMsg($msg) { /* {{{ */ /* id is only set if load() was called before */ if($this->id) { - $queryStr = "UPDATE tblSessions SET flashmsg = " . $this->db->qstr(json_encode($msg)) . " WHERE id = " . $this->db->qstr($this->id); + $queryStr = "UPDATE tblSessions SET splashmsg = " . $this->db->qstr(json_encode($msg)) . " WHERE id = " . $this->db->qstr($this->id); if (!$this->db->getResult($queryStr)) return false; - $this->data['flashmsg'] = $msg; + $this->data['splashmsg'] = $msg; } return true; } /* }}} */ /** - * Set flash message of session + * Set splash message of session * * @param array $msg contains 'typ' and 'msg' */ - function clearFlashMsg() { /* {{{ */ + function clearSplashMsg() { /* {{{ */ /* id is only set if load() was called before */ if($this->id) { - $queryStr = "UPDATE tblSessions SET flashmsg = '' WHERE id = " . $this->db->qstr($this->id); + $queryStr = "UPDATE tblSessions SET splashmsg = '' WHERE id = " . $this->db->qstr($this->id); if (!$this->db->getResult($queryStr)) return false; - $this->data['flashmsg'] = ''; + $this->data['splashmsg'] = ''; } return true; } /* }}} */ /** - * Get flash message of session + * Get splash message of session * - * @return array last flash message + * @return array last splash message */ - function getFlashMsg() { /* {{{ */ - return (array) $this->data['flashmsg']; + function getSplashMsg() { /* {{{ */ + return (array) $this->data['splashmsg']; } /* }}} */ } diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 23872febb..52fb4b5fd 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -54,8 +54,8 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { echo "".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS").(strlen($title)>0 ? ": " : "").htmlspecialchars($title)."\n"; echo "\n"; echo "0 ? " class=\"".$bodyClass."\"" : "").">\n"; - if($flashmsg = $this->params['session']->getFlashMsg()) { - $this->params['session']->clearFlashMsg(); + if($flashmsg = $this->params['session']->getSplashMsg()) { + $this->params['session']->clearSplashMsg(); ?>