Completed
Push — development ( 5afdf5...813154 )
by Nils
07:21
created
api/functions.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1798,7 +1798,7 @@  discard block
 block discarded – undo
1798 1798
                                             'type' => 'folder_deleted',
1799 1799
                                             'intitule' => "f".$array_category[$i],
1800 1800
                                             'valeur' => $folder->id.', '.$folder->parent_id.', '.
1801
-                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '. $folder->nlevel.', 0, 0, 0, 0'
1801
+                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.$folder->nlevel.', 0, 0, 0, 0'
1802 1802
                                         )
1803 1803
                                     );
1804 1804
                                     //delete folder
@@ -1993,29 +1993,29 @@  discard block
 block discarded – undo
1993 1993
 
1994 1994
                     echo json_encode($json);
1995 1995
                 } else {
1996
-                    rest_error ('NO_PARAMETERS');
1996
+                    rest_error('NO_PARAMETERS');
1997 1997
                 }
1998 1998
             } else if ($GLOBALS['request'][1] === "version") {
1999 1999
                 echo '{"api-version":"'.$api_version.'"}';
2000 2000
             } else {
2001
-                rest_error ('NO_PARAMETERS');
2001
+                rest_error('NO_PARAMETERS');
2002 2002
             }
2003 2003
         } else {
2004
-            rest_error ('METHOD');
2004
+            rest_error('METHOD');
2005 2005
         }
2006 2006
     }
2007 2007
 }
2008 2008
 
2009 2009
 function rest_put() {
2010
-    if(!@count($GLOBALS['request'])==0){
2010
+    if (!@count($GLOBALS['request']) == 0) {
2011 2011
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
2012
-        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/',$request_uri,$matches);
2012
+        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
2013 2013
         if (count($matches) == 0) {
2014
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
2014
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
2015 2015
         }
2016
-        $GLOBALS['request'] =  explode('/',$matches[2]);
2016
+        $GLOBALS['request'] = explode('/', $matches[2]);
2017 2017
     }
2018
-    if(apikey_checker($GLOBALS['apikey'])) {
2018
+    if (apikey_checker($GLOBALS['apikey'])) {
2019 2019
         global $server, $user, $pass, $database, $pre, $link;
2020 2020
         teampass_connect();
2021 2021
 
@@ -2025,7 +2025,7 @@  discard block
 block discarded – undo
2025 2025
 /**
2026 2026
  * @param string $type
2027 2027
  */
2028
-function rest_error ($type,$detail = 'N/A') {
2028
+function rest_error($type, $detail = 'N/A') {
2029 2029
     switch ($type) {
2030 2030
         case 'APIKEY':
2031 2031
             $message = Array('err' => 'This api_key '.$GLOBALS['apikey'].' doesn\'t exist');
Please login to merge, or discard this patch.
admin.settings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
                 <td>
197 197
                       <i class="fa fa-chevron-right mi-grey-1" style="margin-right: .3em;">&nbsp;</i>
198 198
                       <label>' .
199
-                            $LANG['settings_enable_sts'] . '
199
+                            $LANG['settings_enable_sts'].'
200 200
                           &nbsp;<i class="fa fa-question-circle tip" title="'.htmlentities(strip_tags($LANG['settings_enable_sts_tip']), ENT_QUOTES).'"></i>
201 201
                       </label>
202 202
                 </td>
Please login to merge, or discard this patch.
includes/language/ukrainian_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //TURKISH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/arabic_admin_help.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //ARABIC
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/portuguese_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //PORTUGUESE
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/russian_admin_help.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //RUSSIAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/catalan_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CATALAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/german_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //GERMAN
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/french_admin_help.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //FRENCH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else {
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.