[Fmsystem-commits] [17066] more on eventplanner

[sigurdne]

Revision: 17066
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17066
Author:   sigurdne
Date:     2017-09-12 10:09:58 -0400 (Tue, 12 Sep 2017)
Log Message:
-----------
more on eventplanner

Modified Paths:
--------------
    trunk/eventplanner/inc/class.uievents.inc.php
    trunk/eventplanner/inc/class.uivendor.inc.php
    trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
    trunk/eventplannerfrontend/templates/base/css/base.css
    trunk/phpgwapi/inc/class.login.inc.php
    trunk/phpgwapi/templates/frontend/head.inc.php

Modified: trunk/eventplanner/inc/class.uievents.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uievents.inc.php       2017-09-12 09:41:47 UTC 
(rev 17065)
+++ trunk/eventplanner/inc/class.uievents.inc.php       2017-09-12 14:09:58 UTC 
(rev 17066)
@@ -143,13 +143,16 @@
                                )
                        );
 
-                       $filters = $this->_get_filters();
+                       if($this->currentapp == 'eventplanner')
+                       {
+                               $filters = $this->_get_filters();
 
-                       foreach ($filters as $filter)
-                       {
-                               array_unshift($data['form']['toolbar']['item'], 
$filter);
+                               foreach ($filters as $filter)
+                               {
+                                       
array_unshift($data['form']['toolbar']['item'], $filter);
+                               }
                        }
-
+       
                        $parameters = array(
                                'parameter' => array(
                                        array(

Modified: trunk/eventplanner/inc/class.uivendor.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor.inc.php       2017-09-12 09:41:47 UTC 
(rev 17065)
+++ trunk/eventplanner/inc/class.uivendor.inc.php       2017-09-12 14:09:58 UTC 
(rev 17066)
@@ -117,7 +117,7 @@
                                                        array(
                                                                'type' =>  
$this->currentapp == 'eventplanner' ? 'checkbox' : 'hidden',
                                                                'name' => 
'filter_active',
-                                                               'text' => 
lang('showall'),
+                                                               'text' => 
$this->currentapp == 'eventplanner' ? lang('showall') : '',
                                                                'value' =>  1,
                                                                'checked'=> 1,
                                                        )

Modified: trunk/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-09-12 
09:41:47 UTC (rev 17065)
+++ trunk/eventplannerfrontend/inc/class.hook_helper.inc.php    2017-09-12 
14:09:58 UTC (rev 17066)
@@ -145,6 +145,7 @@
                         * $_SESSION['orgs'] is set in 
eventplannerfrontend_external_user::get_user_org_id()
                         */
 
+                       $orgs = array();
                        if(!empty($_SESSION['orgs']) && 
is_array($_SESSION['orgs']))
                        {
                                $orgs = phpgw::get_var('orgs', 'string', 
'SESSION');

Modified: trunk/eventplannerfrontend/templates/base/css/base.css
===================================================================
--- trunk/eventplannerfrontend/templates/base/css/base.css      2017-09-12 
09:41:47 UTC (rev 17065)
+++ trunk/eventplannerfrontend/templates/base/css/base.css      2017-09-12 
14:09:58 UTC (rev 17066)
@@ -1,11 +1,27 @@
 #organsation_select{
     background: #DF0101;
     position:fixed;
-    padding-top:0.5em;
+   /* padding-top:0.5em;*/
+    padding-left: 0.8em;
     padding-right:0.5em;
     z-index:100;
+ }
+
+#org_id{
+    padding-top:0.2em;
+    padding-bottom:0.1em;
+       padding-right: 0.6em;
+    padding-left: 0.6em;
+    display: inline-block;
+    border: 1px solid #ccc;
+       box-shadow: inset 0 1px 3px #ddd;
+    border-radius: 4px;
+    vertical-align: middle;
+    box-sizing: border-box;
+       background-color: #fff;
 }
 
+
 #organsation_select > form > label{
  color:white
 }

Modified: trunk/phpgwapi/inc/class.login.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.login.inc.php      2017-09-12 09:41:47 UTC (rev 
17065)
+++ trunk/phpgwapi/inc/class.login.inc.php      2017-09-12 14:09:58 UTC (rev 
17066)
@@ -416,6 +416,8 @@
                //      _debug_array($_COOKIE);
                //      _debug_array($after);
                //      die();
+                       $GLOBALS['phpgw']->session->phpgw_setcookie('after', 
false, 0);
+
                        if ( is_array($redirect) && count($redirect) )
                        {
                                foreach($redirect as $key => $value)
@@ -430,10 +432,12 @@
                                        $redirect_data['kp3'] = 
phpgw::get_var('kp3', 'string', 'GET');
                                }
 
-                               
$GLOBALS['phpgw']->session->phpgw_setcookie('after', false, 0);
                                
$GLOBALS['phpgw']->redirect_link("{$frontend}/index.php", $redirect_data);
                        }
-                       else if ($redirect)
+
+                       $redirect_arr = explode('.',$redirect);
+
+                       if (count($redirect_arr) == 3 && 
isset($GLOBALS['phpgw_info']['user']['apps'][$redirect_arr[0]]))
                        {
                                
$GLOBALS['phpgw']->redirect_link("{$frontend}/index.php", array('menuaction' => 
$redirect));
                        }

Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php      2017-09-12 09:41:47 UTC 
(rev 17065)
+++ trunk/phpgwapi/templates/frontend/head.inc.php      2017-09-12 14:09:58 UTC 
(rev 17066)
@@ -210,7 +210,7 @@
        {
                $tpl_vars['login_text_org'] = '';
                $tpl_vars['login_text'] = lang('Login');
-               $tpl_vars['login_url'] = 'logout.php?login=1&after='. 
urlencode(json_encode($_GET));
+               $tpl_vars['login_url'] = 'logout.php?login=1&after='. 
$_GET['menuaction'];
                $login_parameter = !empty($config_frontend['login_parameter']) 
? $config_frontend['login_parameter'] : '';
                $custom_login_url = 
!empty($config_frontend['custom_login_url']) ? 
$config_frontend['custom_login_url'] : '';
                if($login_parameter)