Changeset 5399 for trunk/prototype

Timestamp:

01/18/12 16:10:57 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Alteração da estrutura de diretórios da nova API

Location:

trunk/prototype

Files:

• . (modified) (1 prop)
• REST.php (modified) (1 diff)
• Sync.php (modified) (1 diff)
• api (copied) (copied from trunk/prototype/app)
• api/cache/MemoryCache.php (modified) (3 diffs)
• api/config (deleted)
• api/config.php (modified) (2 diffs)
• api/controller.php (modified) (10 diffs)
• api/datalayer.js (modified) (1 diff)
• api/parseTPL.php (copied) (copied from trunk/prototype/app/templates/parseTPL.php)
• api/plugins (deleted)
• api/templates/notify_accept_body.tpl (deleted)
• api/templates/notify_alarm_body.tpl (deleted)
• api/templates/notify_attempt_body.tpl (deleted)
• api/templates/notify_cancel_body.tpl (deleted)
• api/templates/notify_create_body.tpl (deleted)
• api/templates/notify_modify_body.tpl (deleted)
• api/templates/notify_reject_body.tpl (deleted)
• api/templates/notify_subject.tpl (deleted)
• api/templates/notify_suggest_body.tpl (deleted)
• api/templates/parseTPL.php (deleted)
• config/CalDAV.srv (added)
• config/OpenLDAP.srv (modified) (1 diff)
• config/PostgreSQL.srv (modified) (1 diff)
• config/SMTP.srv (modified) (1 diff)
• config/alarm.ini (added)
• config/attachment.ini (added)
• config/calendar.ini (added)
• config/calendarSignature.ini (added)
• config/calendarSignatureAlarm.ini (added)
• config/calendarToSchedulable.ini (added)
• config/expressoCalendar.ini (added)
• config/participant.ini (added)
• config/repeat.ini (added)
• config/schedulable.ini (added)
• config/user.ini (added)
• converter.php (modified) (1 diff)
• import.php (deleted)
• links.php (modified) (1 diff)
• me.php (modified) (1 diff)
• modules/add_event (deleted)
• modules/attach_message/attach_message.js (modified) (2 diffs)
• modules/calendar/alarms.php (modified) (3 diffs)
• modules/calendar/config (added)
• modules/calendar/css/images (deleted)
• modules/calendar/css/layout.css (modified) (1 diff)
• modules/calendar/css/style.css (modified) (2 diffs)
• modules/calendar/export.php (modified) (1 diff)
• modules/calendar/img/cog.png (copied) (copied from trunk/prototype/modules/calendar/css/images/cog.png)
• modules/calendar/img/trash-empty.png (added)
• modules/calendar/img/trash-empty.svg (added)
• modules/calendar/img/trash-full.png (added)
• modules/calendar/img/trash-full.svg (added)
• modules/calendar/index.php (modified) (1 diff)
• modules/calendar/interceptors/DAViCalAdapter.php (modified) (12 diffs)
• modules/calendar/interceptors/DBMapping.php (modified) (5 diffs)
• modules/calendar/interceptors/Notifications.php (modified) (7 diffs)
• modules/calendar/js/debug.js (added)
• modules/calendar/js/init.js (added)
• modules/calendar/templates/calendar_list.ejs (modified) (1 diff)
• modules/calendar/templates/calendarlist.ejs (modified) (1 diff)
• modules/calendar/templates/index.ejs (added)
• modules/calendar/templates/notify_accept_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_accept_body.tpl)
• modules/calendar/templates/notify_alarm_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_alarm_body.tpl)
• modules/calendar/templates/notify_attempt_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_attempt_body.tpl)
• modules/calendar/templates/notify_cancel_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_cancel_body.tpl)
• modules/calendar/templates/notify_create_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_create_body.tpl)
• modules/calendar/templates/notify_modify_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_modify_body.tpl)
• modules/calendar/templates/notify_reject_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_reject_body.tpl)
• modules/calendar/templates/notify_subject.tpl (copied) (copied from trunk/prototype/app/templates/notify_subject.tpl)
• modules/calendar/templates/notify_suggest_body.tpl (copied) (copied from trunk/prototype/app/templates/notify_suggest_body.tpl)
• modules/filters/filters.js (modified) (1 diff)
• modules/mail (added)
• modules/mail/css (added)
• modules/mail/img (added)
• modules/mail/interceptors (added)
• modules/mail/js (added)
• modules/mail/templates (added)
• plugins (copied) (copied from trunk/prototype/app/plugins)
• plugins/davicalCliente/AWLUtilities.php (modified) (1 diff)
• plugins/davicalCliente/XMLDocument.php (modified) (1 diff)
• plugins/davicalCliente/XMLElement.php (modified) (1 diff)
• plugins/davicalCliente/caldav-client-v2.php (modified) (2 diffs)
• plugins/icalcreator/iCalcreator.class.php (modified) (1 diff)
• post.php (modified) (1 diff)
• presentation.html (deleted)
• request.php (modified) (1 diff)
• services/PostgreSQL.php (modified) (1 diff)
• services/iCal.php (modified) (1 diff)
• upload.php (modified) (1 diff)

trunk/prototype/REST.php

@@ -52 +52 @@
 }
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 
 $URI = Controller::URI( $concept, $id );

trunk/prototype/Sync.php

@@ -39 +39 @@
 }
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 
 $mounted = array(); $synced = array();

trunk/prototype/api/cache/MemoryCache.php

@@ -42 +42 @@
 
     public function  __construct($conf=Null) {
-        $this->_memcache = new Memcache();
-        $this->_config = $conf;
+        //$this->_memcache = new Memcache();
+//        $this->_config = $conf;
 
         // host, port, persistent, weight
-        if($conf!==Null){
-            foreach ($conf as $c){
-                $result = $this->_memcache->addServer($c[0], $c[1], $c[2], $c[3]);
-            }
-        }
-        else{
-            $this->_memcache->addServer('localhost', 11211);
-        }
+//        if($conf!==Null){
+//            foreach ($conf as $c){
+//                $result = $this->_memcache->addServer($c[0], $c[1], $c[2], $c[3]);
+//            }
+//        }
+//        else{
+//            $this->_memcache->addServer('localhost', 11211);
+//        }
     }
 
@@ -67 +67 @@
     public function put($id, $data, $expire=0, $compressed=false){
 
-        ob_start();
-        print_r( "criando $id e armazenando no cache" );
-        $output = ob_get_clean();
-        file_put_contents( "/tmp/cache.log", file_get_contents( "/tmp/cache.log" ) . $output . "\n" );
 
 //         if($compressed)
@@ -89 +85 @@
 //         $return = $this->_memcache->get($id);
           $return = false;
-
-        if( $return ){
-            ob_start();
-            print_r( "lendo $id do cache" );
-            $output = ob_get_clean();
-            file_put_contents( "/tmp/cache.log", file_get_contents( "/tmp/cache.log" ) . $output . "\n" );
-        }
 
         return( $return );

trunk/prototype/api/config.php

@@ -8 +8 @@
     static function module($config , $module = false)
     {
-        self::init();
-      
         //Todo: registrar na nova api o currentapp
         if(!$module)
             $module =  $_SESSION['flags']['currentapp'];
-        /*
-        if( !isset( $_SESSION['config'][$module] ) )
-            Carregar Config do modulo
-         */  
+  
+        if( !isset( $_SESSION['config'][$module] ) || !isset( $_SESSION['config'][$module][$config] ))
+            $_SESSION['config'][$module] = parse_ini_file( ROOTPATH."/config/$module.ini", true );
         
         return isset($_SESSION['config'][$module][$config]) ? $_SESSION['config'][$module][$config] : false;
@@ -24 +21 @@
     static function me($config)
     {
-        self::init();
+        
         return isset($_SESSION['wallet']['user'][$config]) ? $_SESSION['wallet']['user'][$config] : false;
-     
     }
-
+    
+    static function service( $service , $config )
+    {
+        if( !isset( $_SESSION['wallet'][$service] ) || !isset( $_SESSION['wallet'][$service][$config] ))
+            $_SESSION['wallet'][$service] = parse_ini_file( ROOTPATH."/config/$service.srv", true );
+        
+        return isset($_SESSION['wallet'][$service][$config]) ? $_SESSION['wallet'][$service][$config] : false;
+    }
+    
     static function regSet( $name , $value)
     {
-            self::$register[$name] = $value;
+        self::$register[$name] = $value;
     }
     static function regGet ($name )
     {
-            return (isset(self::$register[$name]) ? self::$register[$name] : false );
+        return (isset(self::$register[$name]) ? self::$register[$name] : false );
     }
 
-    static function init()
+    static function init( $header = false )
     {
-        if ( isset( $_COOKIE[ 'sessionid' ] ) ) 
-            session_id( $_COOKIE[ 'sessionid' ] ); 
+        
+        if( !defined( 'ROOTPATH' ) )
+            define( 'ROOTPATH', dirname(__FILE__).'/..' );
+        
+        if ( isset( $_COOKIE[ 'sessionid' ] ) ) 
+        {
+            session_id( $_COOKIE[ 'sessionid' ] ); 
+            $GLOBALS['phpgw']->session->sessionid = $_COOKIE[ 'sessionid' ];
+        }
+                
+        if( !self::$sessionStarted )
+            self::$sessionStarted = session_start();
+                
+        if( $header === true )
+        {
+            require_once (dirname(__FILE__).'/../../header.inc.php');
 
-        if( !self::$sessionStarted )
-            self::$sessionStarted = session_start();
+            $_SESSION['wallet']['Sieve']['user']          =  $GLOBALS['phpgw_info']['user']['account_lid'];
+            $_SESSION['wallet']['Sieve']['password']      =  $GLOBALS['phpgw_info']['user']['passwd'];
+
+            $_SESSION['wallet']['Cyrus']['user']          =  $GLOBALS['phpgw_info']['user']['account_lid'];
+            $_SESSION['wallet']['Cyrus']['password']      =  $GLOBALS['phpgw_info']['user']['passwd'];
+
+            $_SESSION['wallet']['user']['uid']            =  $GLOBALS['phpgw_info']['user']['userid'];
+            $_SESSION['wallet']['user']['uidNumber']      =  $GLOBALS['phpgw_info']['user']['account_id'];
+            $_SESSION['wallet']['user']['password']       =  $GLOBALS['phpgw_info']['user']['passwd'];
+            $_SESSION['wallet']['user']['cn']             =  $GLOBALS['phpgw_info']['user']['cn'];
+            $_SESSION['wallet']['user']['mail']           =  $GLOBALS['phpgw_info']['user']['email'];
+
+            $_SESSION['wallet']['PostgreSQL']['user']     = $GLOBALS['phpgw_info']['server']['db_user'];
+            $_SESSION['wallet']['PostgreSQL']['password'] = $GLOBALS['phpgw_info']['server']['db_pass'];
+            $_SESSION['wallet']['PostgreSQL']['dbname']   = $GLOBALS['phpgw_info']['server']['db_name'];
+            $_SESSION['wallet']['PostgreSQL']['host']     = $GLOBALS['phpgw_info']['server']['db_host'];
+            
+            $_SESSION['wallet']['OpenLDAP']['context']   =  $GLOBALS['phpgw_info']['server']['ldap_context'];
+            $_SESSION['wallet']['OpenLDAP']['host']      =  $GLOBALS['phpgw_info']['server']['ldap_host'];
+           
+        }
+                
     }
+
 }
 
+    Config::init();
+        
+
 ?>

trunk/prototype/api/controller.php

@@ -4 +4 @@
     define( 'ROOTPATH', dirname(__FILE__).'/..' );
 
-require_once(ROOTPATH.'/app/config.php');
+require_once(ROOTPATH.'/api/config.php');
 
 /**
@@ -251 +251 @@
         }
 
-        public static function links( $concept )
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
+        public static function links( $concept = false )
         {
             if( !isset(self::$config[ $concept ]) )
@@ -261 +262 @@
 
         public static function isConcept( $concept )
-            { 
+        { 
             if( isset( self::$config[ $concept ] ) && 
                 self::$config[ $concept ] )
@@ -269 +270 @@
         }
 
-        public static function getConcept( $concept )
+        public static function getConcept( $concept, $moduleName = false )
         {
             if( isset( self::$config[ $concept ] ) )
                 return( self::$config[ $concept ] );
 
-            return( self::$config[ $concept ] = self::loadConfig( $concept ) );
-            }
+            return( self::$config[ $concept ] = self::loadConfig( $concept, $moduleName ) );
+        }
 
         public static function loadCache( $cacheType = 'Memory' )
@@ -283 +284 @@
         }
 
-        public static function loadConfig( $className, $isService = false )
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
+        public static function loadConfig( $className, $isService = false)
         {
             $fileName = $className.'.'.($isService ? 'srv' : 'ini');
 
             $config = self::$cache->get( $fileName );
-
+        
             if( !$config )
             {
-                $config = parse_ini_file( ROOTPATH."/config/$fileName", true );
+                $config = parse_ini_file( ROOTPATH.'/config/'.$fileName, true );
 
                 self::$cache->put( $fileName, $config );
@@ -379 +381 @@
         }
 
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
         public static function service( $serviceName, $concept = false )
         {
@@ -393 +396 @@
                 self::$config[ $serviceName ]['type'] = 'service';
 
-            self::import( 'app/'.self::$config[ $serviceName ]['type'] );   //TODO: Item 4
+            self::import( 'api/'.self::$config[ $serviceName ]['type'] );   //TODO: Item 4
 
             $service = self::load( self::$config[ $serviceName ]['path'],
@@ -416 +419 @@
         }
 
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
         public static function interceptor( $method, $concept = false, $serviceName = false, $isService = false )
         {
@@ -506 +510 @@
           *         array( '=' , 'campo' , 'valor' )
         */
-        
+
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados
         public static function serviceName( $URI, $original = false )
         {
@@ -530 +535 @@
         }
 
+        //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmos nas options passadas
         public static function call( $method, $URI, $properties = false, $options = false, $service = false, $noTX = false )
         {

trunk/prototype/api/datalayer.js

@@ -1013 +1013 @@
             result = this.request( concept, id || filter.filter, filter.criteria );
 
-            if( result && bothSides && !filter.criteria.format )
+            if( result && bothSides && (!filter || 
+                                                                        !filter.criteria || 
+                                                                        !filter.criteria.format) )
             {
               var newResult = [];

trunk/prototype/config/OpenLDAP.srv

@@ -2 +2 @@
 class = "OpenLDAP"
 [config]
+idAtribute = "uidNumber"
 host = 127.0.0.1
-context = "dc=prognus"
-idAtribute = "uidNumber"
-;user = expressodev
-;password = ''
 
+;context = dc=exemplo.com
+;user = 
+;password = 

trunk/prototype/config/PostgreSQL.srv

@@ -2 +2 @@
 class = "PostgreSQL"
 [config]
+port = 5432
+dbname= expresso
+
+;conexão via socket unix 
+host= /tmp
+;conexão via tcp
+;host = 127.0.0.1
+
+;user=
+;password=

trunk/prototype/config/SMTP.srv

@@ -5 +5 @@
 prot = 25
 auth = false
-username = expresso-admin
-password = prognus
+;username =
+;password = 

trunk/prototype/converter.php

@@ -1 +1 @@
 <?php
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 
 $args = Controller::call( 'parse',

trunk/prototype/links.php

@@ -1 +1 @@
 <?php
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 
-$links = Controller::links( $_GET['concept'] );
+$concept = isset($_GET['concept']) ? $_GET['concept'] : false;
 
-$concepts = array();
+$links = Controller::links( $concept );
 
-foreach( $links as $linkName => $linkTarget )
+if( $concept )
+    $links = array( $concept => $links );
+
+$return = array();
+
+foreach( $links as $target => $link )
+{
+    $concepts = array();
+
+    foreach( $link as $linkName => $linkTarget )
          if( Controller::isConcept( $linkName ) )
             $concepts[ $linkName ] = true;
 
-echo json_encode( array( 'concepts' => $concepts, 'links' => $links ) );
+    $return[ $target ] = array( 'concepts' => $concepts, 'links' => $link );
+}
+
+echo json_encode( $concept ? $return[ $concept ] : $return );

trunk/prototype/me.php

@@ -1 +1 @@
 <?php
 
-if ( isset( $_COOKIE[ 'sessionid' ] ) ) 
-     session_id( $_COOKIE[ 'sessionid' ] ); 
+require_once  (dirname(__FILE__).'/api/controller.php');
 
-session_start();
+$me = Controller::read(array('concept' => 'user', 'service' => 'OpenLDAP'  , 'id' => Config::me('uidNumber')));
 
-require_once "app/controller.php";
-        
-echo json_encode( Controller::read(array('concept' => 'user', 'service' => 'OpenLDAP'  , 'id' => Config::me('uidNumber'))) );
+echo json_encode( $me );
+
+// if( !$me )
+//     return;
+// 
+// $links = Controller::links();
+// 
+// $return = array();
+// 
+// foreach( $links as $concept => $link )
+// {
+//     $concepts = array();
+// 
+//     foreach( $link as $linkName => $linkTarget )
+//       if( Controller::isConcept( $linkName ) )
+//          $concepts[ $linkName ] = true;
+// 
+//      $return[ $concept ] = array( 'concepts' => $concepts, 'links' => $link );
+// }
+// 
+// echo json_encode( array( 'me' => $me, 'links' => $return ) );

trunk/prototype/modules/attach_message/attach_message.js

@@ -265 +265 @@
                 var firstFolder = jQuery("#foldertree-container")
                 .removeClass('empty-container')
-                .html(DataLayer.render(BASE_PATH + 'app/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]}))
+                .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]}))
                 .find("#foldertree").treeview()
                 .click(function(event){
@@ -313 +313 @@
                 jQuery("#mailgrid-container")
                 .removeClass('empty-container')
-                .html(DataLayer.render(BASE_PATH + 'app/templates/messagegrid.ejs', {}))
+                .html(DataLayer.render(BASE_PATH + 'api/templates/messagegrid.ejs', {}))
                 .find("#message_attacher_grid")
                 .jqGrid({

trunk/prototype/modules/calendar/alarms.php

@@ -4 +4 @@
         define('ROOTPATH', dirname(__FILE__).'/../..');
 
-require_once ROOTPATH.'/app/controller.php';
+require_once ROOTPATH.'/api/controller.php';
 require_once ROOTPATH.'/modules/calendar/constants.php';
 
@@ -37 +37 @@
                 if((((int)( $ev['startTime'] / 1000 )) - ( $v['time'] * $unit )) < time() ) //ja esta na hora de mandar o alarme ?
                 {                               
-                        require_once (ROOTPATH.'/app/templates/parseTPL.php' );
+                        require_once (ROOTPATH.'/api/parseTPL.php' );
            
                         switch ($v['type']) {
@@ -87 +87 @@
                          
                                                  $mail['isHtml'] = true;                         
-                                                 $mail['body'] = parseTPL::load_tpl($data,ROOTPATH.'/app/templates/notify_alarm_body.tpl');
+                                                 $mail['body'] = parseTPL::load_tpl($data,ROOTPATH.'/modules/calendar/templates/notify_alarm_body.tpl');
                          
                                                  $mail['subject'] = 'Alarme de Calendario';

trunk/prototype/modules/calendar/css/layout.css

@@ -91 +91 @@
 
 .ui-icon.ui-icon-gear {
-        background-image: url(images/cog.png);
+        background-image: url(../img/cog.png);
     background-position: 0 0;
 }

trunk/prototype/modules/calendar/css/style.css

@@ -26 +26 @@
 }
 .expresso-calendar-container #trash.empty {
-        background-image: url(images/trash-empty.png);
+        background-image: url(../img/trash-empty.png);
         background-repeat: no-repeat;
         background-position: bottom center;
@@ -32 +32 @@
 
 .expresso-calendar-container #trash.full {
-        background-image: url(images/trash-full.png);
+        background-image: url(../img/trash-full.png);
         background-repeat: no-repeat;
         background-position: bottom center;

trunk/prototype/modules/calendar/export.php

@@ -1 +1 @@
 <?php
-require_once '../../app/controller.php';
+require_once '../../api/controller.php';
 $params = $_GET;
 

trunk/prototype/modules/calendar/index.php

@@ -1 @@
-<?php
-
-        $GLOBALS['phpgw_info']['flags'] = Array(  'currentapp'    =>      'expressoCalendar',
-                                                  'noheader'      =>      false,
-                                                  'nonavbar'      =>      false,
-                                                  'noappheader'   =>      true,
-                                                  'noappfooter'   =>      true,
-                                                  'nofooter'      =>      true  );
-
-        include('../../../header.inc.php');
-        
-        $_SESSION['flags']['currentapp']  = 'expressoCalendar';
-        
-        
-        $_SESSION['wallet']['Sieve']['user']          = $GLOBALS['phpgw_info']['user']['account_lid'];
-        $_SESSION['wallet']['Sieve']['password']      = $GLOBALS['phpgw_info']['user']['passwd'];
-
-        $_SESSION['wallet']['Cyrus']['user']          = $GLOBALS['phpgw_info']['user']['account_lid'];
-        $_SESSION['wallet']['Cyrus']['password']      = $GLOBALS['phpgw_info']['user']['passwd'];
-
-        $_SESSION['wallet']['user']['uid']            =  $GLOBALS['phpgw_info']['user']['userid'];
-        $_SESSION['wallet']['user']['uidNumber']      =  $GLOBALS['phpgw_info']['user']['account_id'];
-        $_SESSION['wallet']['user']['password']       =  $GLOBALS['phpgw_info']['user']['passwd'];
-        $_SESSION['wallet']['user']['cn']             =  $GLOBALS['phpgw_info']['user']['cn'];
-        $_SESSION['wallet']['user']['mail']           =  $GLOBALS['phpgw_info']['user']['email'];
-                        
-        //Configuração caldav
-        $_SESSION['config']['expressoCalendar']['useCaldav'] = false;
-        $_SESSION['wallet']['caldav']['url'] = 'http://davical.prognus.com.br/caldav.php';
-        /////////////////////////////////////////////////////////////////////////////////////////////////////
-        
-        $_SESSION['wallet']['PostgreSQL']['user']     = $GLOBALS['phpgw_info']['server']['db_user'];
-        $_SESSION['wallet']['PostgreSQL']['password'] = $GLOBALS['phpgw_info']['server']['db_pass'];
-        $_SESSION['wallet']['PostgreSQL']['dbname']   = $GLOBALS['phpgw_info']['server']['db_name'];
-        $_SESSION['wallet']['PostgreSQL']['host']     = $GLOBALS['phpgw_info']['server']['db_host'];
-?>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<script>
-        function dump(arr,level) {
-                var dumped_text = "";
-                if(!level) level = 0;
-
-                //The padding given at the beginning of the line.
-                var level_padding = "";
-                for(var j=0;j<level+1;j++) level_padding += "    ";
-
-                if(typeof(arr) == 'object') { //Array/Hashes/Objects
-                        for(var item in arr) {
-                                var value = arr[item];
-
-                                if(typeof(value) == 'object') { //If it is an array,
-                                        dumped_text += level_padding + "'" + item + "' ...\n";
-                                        dumped_text += dump(value,level+1);
-                                } else {
-                                        dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";
-                                }
-                        }
-                } else { //Stings/Chars/Numbers etc.
-                        dumped_text = "===>"+arr+"<===("+typeof(arr)+")";
-                }
-                return dumped_text;
-        }
-</script>
+<script type='text/javascript' src='js/debug.js'></script>
 <!--<link rel='stylesheet' type='text/css' href="../../../templates/jquery-ui/redmond/jquery-ui.css"/>-->
 
 <!--<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />-->
 <link rel="stylesheet" type="text/css" href="css/reset.css" />
-<link rel='stylesheet' type='text/css' href='../../app/plugins/fullcalendar/fullcalendar.css' />
-<link rel='stylesheet' type='text/css' href='../../app/plugins/fullcalendar/fullcalendar.print.css' media='print' />
-<link rel='stylesheet' type='text/css' href='../../app/plugins/jquery/jquery-ui.custom.css'/>
-<link rel='stylesheet' type='text/css' href='../../app/plugins/icalendar/jquery.icalendar.css'/>
-<link type="text/css" href="../../app/plugins/fgmenu/fg.menu.css" media="screen" rel="stylesheet" />
+<link rel='stylesheet' type='text/css' href='../../plugins/fullcalendar/fullcalendar.css' />
+<link rel='stylesheet' type='text/css' href='../../plugins/fullcalendar/fullcalendar.print.css' media='print' />
+<link rel='stylesheet' type='text/css' href='../../plugins/jquery/jquery-ui.custom.css'/>
+<link rel='stylesheet' type='text/css' href='../../plugins/icalendar/jquery.icalendar.css'/>
+<link rel="stylesheet" type="text/css" href="../../plugins/fgmenu/fg.menu.css" media="screen"/>
 <!--<link type="text/css" href="../../fgmenu/theme/ui.all.css" media="screen" rel="stylesheet" />-->
 
-<link rel='stylesheet' type='text/css' href='../../app/plugins/fileupload/jquery.fileupload-ui.css'/>
-<link rel="stylesheet" href="../../app/plugins/jquery.pagination/pagination.css" />
+<link rel='stylesheet' type='text/css' href='../../plugins/fileupload/jquery.fileupload-ui.css'/>
+<link rel="stylesheet" type='text/css' href="../../plugins/jquery.pagination/pagination.css" />
 
 <!-- JPicker -->
-<link rel="Stylesheet" type="text/css" href="../../app/plugins/jpicker/css/jPicker-1.1.6.min.css" />
-<link rel="Stylesheet" type="text/css" href="../../app/plugins/jpicker/jPicker.css" />
+<link rel="Stylesheet" type="text/css" href="../../plugins/jpicker/css/jPicker-1.1.6.min.css" />
+<link rel="Stylesheet" type="text/css" href="../../plugins/jpicker/jPicker.css" />
 
-<link rel="Stylesheet" type="text/css" href="../../app/plugins/farbtastic/farbtastic.css" />
-<link rel="Stylesheet" type="text/css" href="../../app/plugins/timepicker/jquery-ui-timepicker-addon.css" />
-<link rel="stylesheet" type="text/css" href='../../app/plugins/zebradialog/css/zebra_dialog.css'></link>
+<link rel="Stylesheet" type="text/css" href="../../plugins/farbtastic/farbtastic.css" />
+<link rel="Stylesheet" type="text/css" href="../../plugins/timepicker/jquery-ui-timepicker-addon.css" />
+<link rel="stylesheet" type="text/css" href='../../plugins/zebradialog/css/zebra_dialog.css'></link>
 
 <link rel="stylesheet" type="text/css" href="css/layout.css" />
 <link rel="stylesheet" type="text/css" href="css/style.css" />
 
-<script type='text/javascript' src='../../app/plugins/datejs/date-pt-BR.js'></script>
-<script type='text/javascript' src='../../app/plugins/jquery/jquery.min.js'></script>
-<script type='text/javascript' src='../../app/plugins/icalendar/jquery.icalendar.js'></script>
-<script type='text/javascript' src='../../app/plugins/jquery/jquery-ui.custom.min.js'></script>
-<script type='text/javascript' src="../../app/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script>
-<script type='text/javascript' src="../../app/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>
-<script type='text/javascript' src="../../app/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>
-<script type='text/javascript' src='../../app/plugins/json2/json2.js'></script>
-<script type='text/javascript' src='../../app/plugins/store/jquery.store.js'></script>
-<script type='text/javascript' src='../../app/plugins/fileupload/jquery.fileupload.js'></script>
-<script type='text/javascript' src='../../app/plugins/fileupload/jquery.fileupload-ui.js'></script>
-<script type='text/javascript' src='../../app/plugins/fileupload/jquery.iframe-transport.js'></script>
-<script type='text/javascript' src='../../app/plugins/store/jquery.store.js'></script>
-<script type="text/javascript" src="../../app/plugins/jquery.pagination/jquery.pagination.js"></script>
-<script type='text/javascript' src='../../app/plugins/mask/jquery.maskedinput.js'></script>
-<script type='text/javascript' src='../../app/plugins/alphanumeric/jquery.alphanumeric.js'></script>
-<script type='text/javascript' src='../../app/plugins/watermark/jquery.watermarkinput.js'></script>
-<script type='text/javascript' src='../../app/plugins/encoder/encoder.js'></script>
-<script type='text/javascript' src='../../app/datalayer.js'></script>
+<script type='text/javascript' src='../../plugins/datejs/date-pt-BR.js'></script>
+<script type='text/javascript' src='../../plugins/jquery/jquery.min.js'></script>
+<script type='text/javascript' src='../../plugins/icalendar/jquery.icalendar.js'></script>
+<script type='text/javascript' src='../../plugins/jquery/jquery-ui.custom.min.js'></script>
+<script type='text/javascript' src="../../plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script>
+<script type='text/javascript' src="../../plugins/timepicker/jquery-ui-timepicker-addon.js"></script>
+<script type='text/javascript' src="../../plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>
+<script type='text/javascript' src='../../plugins/json2/json2.js'></script>
+<script type='text/javascript' src='../../plugins/store/jquery.store.js'></script>
+<script type='text/javascript' src='../../plugins/fileupload/jquery.fileupload.js'></script>
+<script type='text/javascript' src='../../plugins/fileupload/jquery.fileupload-ui.js'></script>
+<script type='text/javascript' src='../../plugins/fileupload/jquery.iframe-transport.js'></script>
+<script type='text/javascript' src='../../plugins/store/jquery.store.js'></script>
+<script type="text/javascript" src="../../plugins/jquery.pagination/jquery.pagination.js"></script>
+<script type='text/javascript' src='../../plugins/mask/jquery.maskedinput.js'></script>
+<script type='text/javascript' src='../../plugins/alphanumeric/jquery.alphanumeric.js'></script>
+<script type='text/javascript' src='../../plugins/watermark/jquery.watermarkinput.js'></script>
+<script type='text/javascript' src='../../plugins/encoder/encoder.js'></script>
+<script type='text/javascript' src='../../api/datalayer.js'></script>
 
 <!-- Datejs -->    
 <!-- <script type='text/javascript' src='../../datejs/core.js'></script> -->
-<!--<script type='text/javascript' src='../../app/plugins/datejs/date-pt-BR.js'></script>-->
-<!-- <script type='text/javascript' src='../../app/plugins/datejs/globalization/pt-BR.js'></script> -->
-<script type='text/javascript' src='../../app/plugins/datejs/sugarpak.js'></script>
-<script type='text/javascript' src='../../app/plugins/datejs/parser.js'></script>
+<!-- <script type='text/javascript' src='../../plugins/datejs/date-pt-BR.js'></script>-->
+<!-- <script type='text/javascript' src='../../plugins/datejs/globalization/pt-BR.js'></script> -->
+<script type='text/javascript' src='../../plugins/datejs/sugarpak.js'></script>
+<script type='text/javascript' src='../../plugins/datejs/parser.js'></script>
 
 <!--  <script type='text/javascript' src='../../datejs/time.js'></script>  -->
-<script type='text/javascript' src='../../app/plugins/dateFormat/dateFormat.js'></script>
+<script type='text/javascript' src='../../plugins/dateFormat/dateFormat.js'></script>
+
+<!--<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>-->
+<script type='text/javascript' src='../../plugins/fullcalendar/fullcalendar.js'></script>
+
+<script type='text/javascript' src='../../plugins/jquery.dateFormat/jquery.dateFormat.js'></script>
+
+<script type='text/javascript' src='../../plugins/zebradialog/javascript/zebra_dialog.js'></script>
+<script type='text/javascript' src='../../plugins/scrollto/jquery.scrollTo.js'></script>
+<!-- <script type='text/javascript' src='../../plugins/view/jquerymx-1.0.custom.min.js'></script> -->
+<script type='text/javascript' src='../../plugins/ejs/ejs.js'></script>
+
+<script type="text/javascript" src="../../plugins/fgmenu/fg.menu.js"></script>
+
+<script type="text/javascript" src="../../plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
+
+<!-- JPicker -->
+<script type="text/javascript" src="../../plugins/jpicker/jpicker-1.1.6.min.js"></script>
+<script type="text/javascript" src="../../plugins/farbtastic/farbtastic.js"></script>
+
 <script type='text/javascript' src='js/base64.js'></script>
 <script type='text/javascript' src='js/helpers.js'></script>
 <script type='text/javascript' src='js/calendar.codecs.js'></script>
+<script type='text/javascript' src='js/I18n.js'></script>
+<script type="text/javascript" src="js/init.js"></script>
 
-
-
-<!--<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>-->
-<script type='text/javascript' src='../../app/plugins/fullcalendar/fullcalendar.js'></script>
-<script type='text/javascript' src='js/I18n.js'></script>
-<script type='text/javascript' src='../../app/plugins/jquery.dateFormat/jquery.dateFormat.js'></script>
-
-<script type='text/javascript' src='../../app/plugins/zebradialog/javascript/zebra_dialog.js'></script>
-<script type='text/javascript' src='../../app/plugins/scrollto/jquery.scrollTo.js'></script>
-<!-- <script type='text/javascript' src='../../app/plugins/view/jquerymx-1.0.custom.min.js'></script> -->
-<script type='text/javascript' src='../../app/plugins/ejs/ejs.js'></script>
-
-<script type="text/javascript" src="../../app/plugins/fgmenu/fg.menu.js"></script>
-
-<script type="text/javascript" src="../../app/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
-
-<!-- JPicker -->
-<script src="../../app/plugins/jpicker/jpicker-1.1.6.min.js" type="text/javascript"></script>
-
-<script src="../../app/plugins/farbtastic/farbtastic.js" type="text/javascript"></script>
-
-<script type='text/javascript'>
-
-
-$(document).ready(function() {
-
-        refresh_calendars();
-        $tabs = $('#tabs').tabs({
-            add: function( event, ui ) {
-                        User.lastView = $tabs.tabs('option' ,'selected');
-                        $tabs.tabs('select', '#' + ui.panel.id);
-                },
-                remove: function( event, ui ) {
-                        $tabs.tabs('select', User.lastView);
-                },
-                show: function( event, ui ){
-                        delete Calendar.currentViewKey;
-                        $('#calendar').fullCalendar('refetchEvents');
-                }
-        })
-        .tabs('option', 'tabTemplate', "<li><a href='#{href}'>#{label}</a><span class='ui-icon ui-icon-close'>Remove Tab</span></li>" );
-
-        /**
-          * Make a button to close the tab
-          */
-        $tabs.find( "span.ui-icon-close" ).live( "click", function() {
-                var index = $( "li", $tabs ).index( $( this ).parent() );
-                if($tabs.tabs('option' ,'selected') == index){
-                        if($tabs.tabs("length") == 2 && User.lastView != 1)
-                                $tabs.tabs( "select", 0);
-                        $tabs.tabs( "select", User.lastView);
-                }
-                if($tabs.tabs('option' ,'selected') == 0 || $tabs.tabs('option' ,'selected') == 1)
-                        User.lastView = $tabs.tabs('option' ,'selected');
-                if(index != -1)
-                  $tabs.tabs( "remove", index );        
-                        
-                
-                });     
-        $('.button.config-menu').button({
-            icons: {
-                primary: "ui-icon-gear",
-                secondary: "ui-icon-triangle-1-s"
-            },
-            text: false
-        });
-      $('.button.add').button({
-              icons: {
-                      secondary: "ui-icon-plus"
-              }
-      })
-
-                var miniCalendar = $('.block-vertical-toolbox .mini-calendar').datepicker({
-                        dateFormat: 'yy-m-d',
-                        //dateFormat: 'DD, d MM, yy',
-                        //inline: true,
-                        firstDay: dayOfWeek(User.preferences.weekStart),
-                        onSelect: function(dateText, inst)
-                        {       
-                                $tabs.tabs("select", "#calendar");
-                                var date = dateText.split('-');
-                                var dateFullCalendar = $.fullCalendar.formatDate($('#calendar').fullCalendar('getDate'), "yyyy-MM-dd").split('-');
-                                $('#calendar').fullCalendar('gotoDate',date[0],date[1]-1,date[2]);
-                                $('#calendar').fullCalendar( 'changeView', 'agendaDay' );
-                        }                       
-                })
-                .find('.ui-icon-circle-triangle-e').removeClass('ui-icon-circle-triangle-e').addClass('ui-icon-triangle-1-e').end()
-                .find('.ui-icon-circle-triangle-w').removeClass('ui-icon-circle-triangle-w').addClass('ui-icon-triangle-1-w');
-                
-                //Onclick do mês
-                $('.ui-datepicker-title .ui-datepicker-month').live('click',function(){
-                        $tabs.tabs("select", "#calendar");
-                        $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');
-                        $('#calendar').fullCalendar( 'changeView', 'month');
-                });
-                //Onclick do ano
-                $('.ui-datepicker-title .ui-datepicker-year').live('click',function(){
-                        $tabs.tabs("select", "#calendar");
-                        $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');
-                        $('.fc-button-year').click();
-                });
-                
-        //Onclick em um dia do calendário anual
-        $( ".fc-day-number" ).live( "click", function() {
-                        
-                var date = $(this).parents('[class*="fc-day-"]').attr('class').match(/fc-day-(\d{4})-(\d{2})-(\d{2})/);
-
-                if (date) date.shift();
-                else return false;
-
-                $('#calendar').fullCalendar('gotoDate',date[0],date[1]-1,date[2]);
-                $('#calendar').fullCalendar( 'changeView', 'agendaDay' );
-        });     
-
-        $('.main-search input.search').keydown(function(event){
-                if(event.keyCode == 13) {
-                        Encoder.EncodeType = "entity";
-                        //$(this).val($(this).val());
-                                        
-                        add_events_list($(this).val());
-                        $(this).val('');
-                }
-        });
-                                
-        $('.block-horizontal-toolbox .main-config-menu').menu({
-                content: $('.main-config-menu-content').html(),
-                positionOpts: {
-                        posX: 'left', 
-                        posY: 'bottom',
-                        offsetX: -140,
-                        offsetY: 0,
-                        directionH: 'right',
-                        directionV: 'down', 
-                        detectH: true, // do horizontal collision detection  
-                        detectV: true, // do vertical collision detection
-                        linkToFront: false
-                },
-                flyOut: true,
-                showSpeed: 100,
-                crumbDefaultText: '>'
-        });
-              
-                $('#trash').droppable({
-                        drop: function(event, ui){
-                                //              calendar.fullCalendar( 'removeEvents', ui.draggable.attr('event-id') );
-                                DataLayer.remove( "event", ui.draggable.attr('event-id') );
-                                $(this).switchClass('empty','full');
-                        },
-                        tolerance: "touch"
-                });
-
-      /* initialize the calendar
-      -----------------------------------------------------------------*/
-                $(".button.add.add-event").click(function(event){
-                        var startEvent = new Date(); 
-                        if(startEvent.toString('mm') < 30)
-                                startEvent.add({minutes: 30 - parseInt(startEvent.toString('mm'))});
-                        else
-                                startEvent.add({hours: 1, minutes: '-'+startEvent.toString('mm')});
-                        var endEvent = function(date){
-                                if(!!User.preferences.defaultCalendar){
-                                        return Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration != "" ? 
-                                                (parseInt(date.getTime()) + Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000) 
-                                                : (User.preferences.defaultDuration * 60000);
-                                }else
-                                        return parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000);
-                        };      
-                        eventDetails({ 
-                                startTime: startEvent.getTime(),
-                                endTime: endEvent(startEvent)
-                        }, true );
-                });
-
-        var calendar = $('#calendar').fullCalendar({
-
-                defaultView: User.preferences.defaultCalView,
-                timeFormat: User.preferences.hourFormat,
-                axisFormat: User.preferences.hourFormat,
-                eventSources: Calendar.sources,
-
-                header: {
-                        left: 'prev,next today,basicWeek,basicDay',
-                        center: 'title',
-                        right: 'agendaDay,agendaWeek,month,year'
-                },
-                firstDay: dayOfWeek(User.preferences.weekStart),
-                editable: true,
-                selectable: true,
-                selectHelper: true,
-                droppable: true, // this allows things to be dropped onto the calendar !!!
-                timeFormat: {
-                        agenda: 'HH:mm{ - HH:mm}',
-                        '': 'HH:mm{ - HH:mm} }'
-                },
-                titleFormat: {
-                        month: 'MMMM yyyy',                             
-                        week: "dd[ yyyy] { 'a'[ MMM] dd 'de' MMMM '-' yyyy}", 
-                        day: 'dddd,  dd MMM, yyyy'
-                },
-                columnFormat:{
-                        month: 'ddd',    
-                        week: 'ddd dd/MM', 
-                        day: 'dddd dd/MM'  
-                },
-                monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho','Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro' ], 
-                monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez'],
-                dayNames: [ 'Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],
-                dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],
-                dayNamesShortest: ['D','S','T','Q','Q','S','S'],
-                allDayText: 'Dia todo',
-                buttonText: {
-                        today: 'hoje',
-                        month: 'mês',
-                        week: 'semana',
-                        day: 'dia',
-                        year: 'ano'
-                },
-                
-                eventRender: function( event, element, view ){
-                        $(element).attr( 'event-id', event.id );
-                },
-
-                select: function( start, end, allDay, event, view ){
-                        eventDetails( { 'start': start,
-                                        'end': end,
-                                        'allDay': allDay } );
-                },
-
-                eventDrop: function( event ){
-                        DataLayer.put( "schedulable:calendar", event );
-                },
-
-                eventResize: function( event ){
-                        DataLayer.put( "schedulable:calendar", event );
-                },
-
-                eventClick: function( evt, event, view ){
-                        eventDetails( DataLayer.get( "schedulable", evt.id), true);
-                }
-        });
-          
-        if($(window).height() < $('body').height()){
-                var hei = $('body').height() - $(window).height();
-                hei = $('#divAppbox').height() - hei;
-                $('#divAppbox').css('max-height', hei);
-                $('#divAppbox').css('min-height', hei);
-                $('body').css('overflow-y','hidden');
-                delete hei;
-         }
-          
-         $(window).resize(function(){
-                $('#divAppbox').css('max-height', $(window).height() - 104);
-                $('#divAppbox').css('min-height', $(window).height() - 104);
-                $('#divAppbox').css('overflow-x', 'auto');
-                $('#divAppbox').css('overflow-y', 'scroll');
-        });       
-        //Todo chamada do metodo que adiciona ao full calendar o botao de listagem de eventos  
-        //listEvents();
-});
-</script>
 </head>
 

trunk/prototype/modules/calendar/interceptors/DAViCalAdapter.php

@@ -39 +39 @@
     
     static function import($data , $params = false)
-    {              
+    {                  
         $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$params['owner'])));  
         $params['owner'] = $user[0]['id'];
@@ -87 +87 @@
         if(isset($params['calendar']))
         { 
-            require_once ROOTPATH.'/app/plugins/icalcreator/iCalUtilityFunctions.class.php';
-            require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php';
+            require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php';
+            require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
             
             $vcalendar = new icalCreator( ); 
@@ -118 +118 @@
     
     static function move($origem , $destino , $owner)
-    {    
+    {  
         $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$owner)));  
         $owner = $user[0]['id'];
@@ -153 +153 @@
     {  
       ob_start();
-      require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-      $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password'] );
-      $cal->DoPUTRequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );  
+      require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+      $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password'] );
+      $cal->DoPUTRequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );  
       ob_end_clean();
     }
@@ -162 +162 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
-       $cal->DoDELETERequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$data.'.ics' );
+       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
+       $cal->DoDELETERequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$data.'.ics' );
        ob_end_clean();
     }
@@ -171 +171 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
-       $cal->DoDELETERequest($_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$data.'/');
+       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
+       $cal->DoDELETERequest(Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$data.'/');
        ob_end_clean();
     }
@@ -180 +180 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);       
+       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);       
        $cal->DoMOVERequest( $origem.'/' , $destination.'/' );
        ob_end_clean();
@@ -189 +189 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);       
+       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);       
        ob_end_clean();
        return $cal->FindCalendars();
@@ -198 +198 @@
     {
         ob_start();
-        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
+        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
  
         $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?>
@@ -216 +216 @@
           
           
-        $cal->DoXMLRequest('MKCALENDAR', $xml, $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$location.'/');
+        $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$location.'/');
         ob_end_clean();
     }
@@ -223 +223 @@
     {
         ob_start();
-        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
+        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
          
         $events = $cal->GetCollectionETags($url) ;
@@ -234 +234 @@
             $args = array_merge($args , $sync);
         }
-           
-        
+          
         include ROOTPATH.'/Sync.php';
         ob_end_clean();

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -682 +682 @@
         if($valid == true)
         {
-             $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', $_SESSION['wallet']['user']['uidNumber']) );        
+             $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', Config::me('uidNumber')) );        
             $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria );
 
@@ -709 +709 @@
     public function createSchedulableMails( &$uri , &$result , &$criteria , $original ){
         
-        require_once (ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php' );
-        require_once (ROOTPATH.'/app/templates/parseTPL.php' );
+        require_once (ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php' );
+        require_once (ROOTPATH.'/api/parseTPL.php' );
         $schedulable = Controller::read( array( 'concept' => 'schedulable' , 'id' => $result['id'] )); 
         $participants = Controller::find( array( 'concept' => 'participant' ) , false ,array( 'filter' => array('=', 'schedulable' ,  $result['id']) )) ; 
@@ -777 +777 @@
                                                           'schedulableLocation' =>  $schedulable['location'],
                                                           'participants' =>  $attList
-                                                        ),ROOTPATH.'/app/templates/notify_create_body.tpl');
+                                                        ),ROOTPATH.'/api/templates/notify_create_body.tpl');
                 
                 //TODO: Internacionalização do Subject
@@ -824 +824 @@
 //HELPERS
     private static function decodeRepeat( $repeat , $start , $end ) {
-    require_once ROOTPATH.'/app/plugins/when/When.php';
+    require_once ROOTPATH.'/plugins/when/When.php';
 
     $r = new When();
@@ -982 +982 @@
         $op = array_shift($filter);
 
-        if (is_array($filter[0])) {
+        if (isset($filter[0]) && is_array($filter[0])) {
             foreach ($filter as $i => $f)
                 $filter[$i] = self::validExternalUserCriteria($f, $map ,$findCalendar );

trunk/prototype/modules/calendar/interceptors/Notifications.php

@@ -2 +2 @@
 require_once ROOTPATH.'/modules/calendar/constants.php';
 require_once ROOTPATH.'/modules/calendar/interceptors/Helpers.php';
-require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php';
-require_once ROOTPATH.'/app/templates/parseTPL.php';
+require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
+require_once ROOTPATH.'/api/parseTPL.php';
  
 class Notifications extends Helpers 
@@ -140 +140 @@
             
              $subject['notificationType'] = 'Convite de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -200 +200 @@
           
         $subject['notificationType'] = 'Convite Aceito';
-        $subject['eventTitle'] = $schedulable['summary'];
+        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
         $subject['startDate'] = date_format( $sTime , 'd/m/Y');
         $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -241 +241 @@
        $mail['attachments'][] = $ical;
        $mail['isHtml'] = true;                         
-       $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/app/templates/'.$template.'.tpl');
-       $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/app/templates/notify_subject.tpl');;
+       $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/'.$template.'.tpl');
+       $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
        $mail['from'] = Config::me('mail');   
        $mail['to'] = $to;
@@ -293 +293 @@
                     
              $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -347 +347 @@
            
              $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -421 +421 @@
 
             $subject['notificationType'] = 'Modificação de Calendario';
-            $subject['eventTitle'] = $schedulable['summary'];
+            $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
             $subject['startDate'] = date_format($sTime, 'd/m/Y');
             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i');

trunk/prototype/modules/calendar/templates/calendar_list.ejs

@@ -22 +22 @@
                                                 </div> 
                                                         <a class="cal-list-options-btn my-cal-list-options-btn-<%= agendas_usuario[i].id %>" style="background-color:#<%=assinatures.backgroundColor%>; border-color:#<%= assinatures.borderColor%>;">
-                                                                <img src="img/arrow_down.png" width="10" height="10" class="cal-list-img"/>
+                                                                <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/>
                                                         </a>
                                                         

trunk/prototype/modules/calendar/templates/calendarlist.ejs

@@ -10 +10 @@
                                                 
                                                 <a class="cal-list-options-btn my-cal-list-options-btn-<%= i %>" onclick="show_cal_list_options('my-cal-list-options-', <%= i %>)">
-                                                        <img src="img/arrow_down.png" width="10" height="10" class="cal-list-img"/>
+                                                        <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/>
                                                 </a>
                                                 <div class="cal-list-options my-cal-list-options-<%= i %> hidden">

trunk/prototype/modules/filters/filters.js

@@ -229 +229 @@
     details_container.accordion({autoHeight: false});
     
-    DataLayer.render( BASE_PATH + 'app/templates/folderselect.ejs', 'folder:select', function( html ){
+    DataLayer.render( BASE_PATH + 'api/templates/folderselect.ejs', 'folder:select', function( html ){
           details_container.find(".select-folderlist").append( html );
     });

trunk/prototype/plugins/davicalCliente/AWLUtilities.php

@@ -365 +365 @@
 
 if ( !function_exists("translate") ) {
-    require_once ROOTPATH.'/app/plugins/davicalCliente/Translation.php';
+    require_once ROOTPATH.'/plugins/davicalCliente/Translation.php';
 
 }

trunk/prototype/plugins/davicalCliente/XMLDocument.php

@@ -10 +10 @@
 *
 */
-require_once ROOTPATH.'/app/plugins/davicalCliente/XMLElement.php';
+require_once ROOTPATH.'/plugins/davicalCliente/XMLElement.php';
 
 /**

trunk/prototype/plugins/davicalCliente/XMLElement.php

@@ -9 +9 @@
 * @license   http://www.gnu.org/licenses/lgpl-3.0.txt  GNU LGPL version 3 or later
 */
-require_once ROOTPATH.'/app/plugins/davicalCliente/AWLUtilities.php';
+require_once ROOTPATH.'/plugins/davicalCliente/AWLUtilities.php';
 
 /**

trunk/prototype/plugins/davicalCliente/caldav-client-v2.php

@@ -11 +11 @@
 */
  
-require_once ROOTPATH.'/app/plugins/davicalCliente/XMLDocument.php';
+require_once ROOTPATH.'/plugins/davicalCliente/XMLDocument.php';
 
 /**
@@ -364 +364 @@
     $this->requestMethod = 'MOVE';
     $this->headers[] = 'Destination: '.$this->base_url.$destination;
-    return $this->DoRequest($this->base_url.$origem);
+    return $this->DoRequest($this->base_url.urlencode($origem));
   }
 

trunk/prototype/plugins/icalcreator/iCalcreator.class.php

@@ -53 +53 @@
 /*********************************************************************************/
 /*         since 2.6.22 - 2010-09-25, do NOT remove!!                            */
-require_once ROOTPATH.'/app/plugins/icalcreator/iCalUtilityFunctions.class.php';
+require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php';
 /*********************************************************************************/
 /*         version, do NOT remove!!                                              */

trunk/prototype/post.php

@@ -5 +5 @@
 $data = $_REQUEST['data']; unset( $_REQUEST['data'] );
 
-require_once "app/controller.php";
+require_once "api/controller.php";
 
 echo json_encode( Controller::put( $_REQUEST, $data ) );

trunk/prototype/request.php

@@ -26 +26 @@
 $service = ( $criteria && isset( $criteria['service'] ) )? $criteria['service']: false;
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 
 ///Conversor Para utf8 ante de codificar para json pois o json so funciona com utf8

trunk/prototype/services/PostgreSQL.php

@@ -96 +96 @@
 
     public function open  ( $config ){
-        
+                        
         $this->config = $config;
         

trunk/prototype/services/iCal.php

@@ -1 +1 @@
 <?php
 
-require_once ROOTPATH.'/app/plugins/icalcreator/iCalUtilityFunctions.class.php';
-require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php';        
+require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php';
+require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';        
 require_once ROOTPATH.'/modules/calendar/constants.php';
 

trunk/prototype/upload.php

@@ -3 +3 @@
 $result = array();
 
-require_once 'app/controller.php';
+require_once 'api/controller.php';
 $URI = Controller::URI( 'attachment' );