Changeset 6754 for branches/2.4/phpgwapi

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• phpgwapi/inc/class.browser.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.setup_process.inc.php (modified) (1 diff)
• phpgwapi/setup/setup.inc.php (modified) (1 diff)
• phpgwapi/setup/tables_update.inc.php (modified) (1 diff)
• phpgwapi/templates/default/login_default.php (modified) (2 diffs)

branches/2.4/phpgwapi/inc/class.browser.inc.php

@@ -44 +44 @@
                 const PLATFORM_ANDROID = 'Android';
                 const PLATFORM_UNIX = 'Unix';
-                const PLATFORM_WINMOBILE = 'WinMobile'; 
+                const PLATFORM_WINMOBILE = 'WinMobile';
 
                 function browser()
@@ -118 +118 @@
                                 $this->BROWSER_PLATFORM = self::PLATFORM_MAC;
                         }
-                        elseif(strstr($HTTP_USER_AGENT,'IEMobile')) 
-            { 
-                    $this->BROWSER_PLATFORM = self::PLATFORM_WINMOBILE; 
-            } 
+                        elseif(strstr($HTTP_USER_AGENT,'IEMobile'))
+                        {
+                                $this->BROWSER_PLATFORM = self::PLATFORM_WINMOBILE;
+                        }       
                         elseif(strstr($HTTP_USER_AGENT,'Win'))
                         {
                                 $this->BROWSER_PLATFORM = self::PLATFORM_WINDOWS;
-                        }                       
+                        }       
                         elseif(strstr($HTTP_USER_AGENT,'Linux'))
                         {

branches/2.4/phpgwapi/inc/class.setup_process.inc.php

@@ -737 +737 @@
                                                                 }
                                                         }
-                                                        // elseif ($GLOBALS['phpgw_setup']->alessthanb($value,$currentver)) 
-                                // { 
-                                //      if($DEBUG) { echo '<br>process->upgrade(): running baseline delta only: ' . $function . '...'; } 
-                                //      $GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = True; 
-                                //      $success = $function();
+                                                        // elseif ($GLOBALS['phpgw_setup']->alessthanb($value,$currentver))
+                                                        // {
+                                                        //      if($DEBUG) { echo '<br>process->upgrade(): running baseline delta only: ' . $function . '...'; }
+                                                        //      $GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = True;
+                                                        //      $success = $function();
                                                                 
-                                                        //      // is the next update the one we need? 
-                            //      if ($success && $test[$x+1] != $success && 
-                            //              ($num = array_search($success,$test)) !== False && $num !== null) 
-                            //      { 
-                            //              // do we have the needed update somewhere else in the row? 
-                            //              // if yes, position the array-pointer just before that update and continue 
-                            //              reset($test); 
-                            //              while((list($x,$value) = each($test)) && $x < $num-1); 
-                            //              continue; 
-                            //      } 
-                            // }
+                                                        //      // is the next update the one we need?
+                                                        //      if ($success && $test[$x+1] != $success &&
+                                                        //              ($num = array_search($success,$test)) !== False && $num !== null)
+                                                        //      {
+                                                        //              // do we have the needed update somewhere else in the row?
+                                                        //              // if yes, position the array-pointer just before that update and continue
+                                                        //              reset($test);
+                                                        //              while((list($x,$value) = each($test)) && $x < $num-1);
+                                                        //              continue;
+                                                        //      }
+                                                        // }
                                                         else
                                                         {                                                               

branches/2.4/phpgwapi/setup/setup.inc.php

@@ -14 +14 @@
         $setup_info['phpgwapi']['name']      = 'phpgwapi';
         $setup_info['phpgwapi']['title']     = 'API';
-        $setup_info['phpgwapi']['version']   = '2.4.0';
-        $setup_info['phpgwapi']['versions']['current_header'] = '2.4.0';
+        $setup_info['phpgwapi']['version']   = '2.4.1';
+        $setup_info['phpgwapi']['versions']['current_header'] = '2.4.1';
         $setup_info['phpgwapi']['enable']    = 3;
         $setup_info['phpgwapi']['app_order'] = 1;

branches/2.4/phpgwapi/setup/tables_update.inc.php

@@ -163 +163 @@
                 return $GLOBALS['setup_info']['phpgwapi']['currentver'];
         }
+        $test[] = '2.4.0';
+        function phpgwapi_upgrade2_4_0()
+        {
+                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '2.4.1';
+                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+        }
 ?>

branches/2.4/phpgwapi/templates/default/login_default.php

@@ -177 +177 @@
                         else
                                 $_POST['login'] = $_POST['user'];
+
+                        /**
+                         * LOGIN OAUTH POR CURL
+                         */
+                        $ch = curl_init();
+
+                        $restConf = parse_ini_file( __DIR__ . '/../../../prototype/config/REST.ini', true );
+
+                        $param  = 'grant_type=password';
+                        $param .= '&client_id=' . $restConf['oauth']['client_id'];
+                        $param .= '&client_secret=' . $restConf['oauth']['client_secret'];
+                        $param .= '&username=' . $_POST['user'];
+                        $param .= '&password=' . $_POST['passwd'];
+
+                        // set URL and other appropriate options
+                        curl_setopt($ch, CURLOPT_URL, $restConf['oauth']['url_token']);
+                        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Accept: */*'));
+                        curl_setopt($ch, CURLOPT_POST, TRUE);
+                        curl_setopt($ch, CURLOPT_POSTFIELDS, $param);
+                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);  //configura para nao imprimir a saida na tela
+                        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);//Passe um nￜmero long como parￜmetro que contￜm o limite de tempo, em segundos, que vocￜ permite as funￜￜes CURL levar. 
+
+                        // grab URL and pass it to the browser
+                        $res = curl_exec($ch);
+                        
+                        // close cURL resource, and free up system resources
+                        curl_close($ch);
+                        $a = json_decode($res);
+        
+                        if ( isset($a->access_token) ) {
+                                $_SESSION['oauth']['access_token'] = $a->access_token;
+                                $_SESSION['oauth']['expires_in'] = $a->expires_in;
+                                $_SESSION['oauth']['token_type'] = $a->token_type;
+                                $_SESSION['oauth']['scope'] = $a->scope;
+                                $_SESSION['oauth']['refresh_token'] = $a->refresh_token;
+                                
+                        }
+                        else {
+                        }
+                        /**
+                         * ####################
+                         */
+
                 }
                 if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' &&
@@ -598 +641 @@
         if(isset($ultima_revisao)) $tmpl->set_var('ultima_rev','<br>' . $ultima_revisao);
 
-        // Adiciona código personalizado de outro template
+        // Adiciona cï¿œdigo personalizado de outro template
         // que esteja utilizando o login_default.php
         if(is_file('.'.$template_dir.'/login.inc.php')) {