2.0.0-20200222-01

cfg/.gitignore

@@ -0,0 +1 @@
+custom*.inc.php

cfg/const.inc.php

@@ -15,21 +15,23 @@
 
 
 /* [GLOBAL SETTINGS] */
-
 define('TL_SMARTY_VERSION',3);  // @since 1.9.8
+define('TL_JQUERY','third_party/jquery/jquery-3.4.1.min.js');  
+
 
 /** TestLink Release version (MUST BE changed before the release day) */
-define('TL_VERSION_NUMBER', '1.9.20'); 
+define('TL_VERSION_NUMBER', '2.0.0'); 
 define('TL_VERSION', TL_VERSION_NUMBER . ' [DEV] '); 
-define('TL_FACE_DIR', 'prague'); 
+define('TL_FACE_DIR', 'buenosaires'); 
 
 /** Latest Database version that is used to give users feedback 
  *  about necesssary upgrades
  *  if you set this parameter also upgrade 
  *  lib/functions/configCheck.php - checkSchemaVersion() */
-define('TL_LATEST_DB_VERSION', 'DB ' . '1.9.20');
+define('TL_LATEST_DB_VERSION', 'DB ' . '2.0.0');
 
-// needed to avoid problems in install scripts that do not include config.inc.php
+// needed to avoid problems in install scripts 
+// that do not include config.inc.php
 // want to point to root install dir, need to remove fixed part
 if (!defined('TL_ABS_PATH')) {
   define('TL_ABS_PATH', str_replace('cfg','',dirname(__FILE__)));
@@ -60,7 +62,7 @@
 }
 
 
-// --------------------------------------------------------------------------------
+// -----------------------------------------------------------------
 /* [GENERAL MAGIC NUMBERS] */
 
 /** PHPMAILER */
@@ -81,15 +83,9 @@
 define('ERROR',    0 );
 
 /** More Descriptive constant names */
-define('HIGH',    3 );
-define('MEDIUM',   2 );
-define('LOW',     1 );
-
-/** user for notes - see BUGID 0002469: $tlCfg->exec_cfg->expand_collapse 
-  very important do not change values, logic depends on values*/
-define('LAST_USER_CHOICE',2);
-define('COLLAPSE', 0);
-define('EXPAND',1 );
+define('HIGH', 3);
+define('MEDIUM', 2);
+define('LOW',1);
 
 // used in several functions instead of MAGIC NUMBERS - Don't change 
 define('ALL_PRODUCTS', 0);
@@ -962,6 +958,4 @@
 define('USE_LATEST_EXEC_ON_CONTEX_FOR_COUNTERS', 1);
 define('USE_LATEST_EXEC_ON_TESTPLAN_FOR_COUNTERS',2);
 define('USE_LATEST_EXEC_ON_TESTPLAN_PLAT_FOR_COUNTERS',3);
-
-
 // END 

config.inc.php

@@ -123,10 +123,11 @@
 
 
 /** Include constants and magic numbers (users should not change it)*/
-require_once(TL_ABS_PATH . 'cfg' . DIRECTORY_SEPARATOR . 'const.inc.php');
+$cfgPath = TL_ABS_PATH . 'cfg' . DIRECTORY_SEPARATOR;
+require_once($cfgPath . 'const.inc.php');
 
 
-// ----------------------------------------------------------------------------
+// --------------------------------------------------------------
 /** @var string used to have (when needed) a possibility to identify different TL instances
     @since 1.9.4 used on mail subject when mail logger is used
  */
@@ -148,7 +149,7 @@
  * @see $tlCfg->cookie->path
  * @global string $tlCfg->cookie->prefix
  */
-$tlCfg->cookie->prefix = 'TESTLINK1920';
+$tlCfg->cookie->prefix = 'TESTLINK200';
 
 /**
  * @link http://php.net/function.setcookie
@@ -1138,15 +1139,23 @@
 // 'latest' => latest execution notes.
 $tlCfg->exec_cfg->steps_exec_status_default = 'empty';
 
-// Parameters to show notes/details when entering test execution feature
-// EXPAND: show expanded/open
-// COLLAPSE: show collapsed/closede
-// LAST_USER_CHOICE: get status from cookie that holds last user choice.[STANDARD BEHAVIOUR]
+// Parameters to show notes/details 
+// when entering test execution feature
+// 'EXPAND': show expanded/open
+// 'COLLAPSE': show collapsed/closed
+// 'LAST_USER_CHOICE': 
+//   get status from cookie that holds 
+//   latest user choice.
+//   This is the [STANDARD BEHAVIOUR]
 $tlCfg->exec_cfg->expand_collapse = new stdClass();
-$tlCfg->exec_cfg->expand_collapse->testplan_notes = LAST_USER_CHOICE;
-$tlCfg->exec_cfg->expand_collapse->platform_description = LAST_USER_CHOICE;
-$tlCfg->exec_cfg->expand_collapse->build_description = LAST_USER_CHOICE;
-$tlCfg->exec_cfg->expand_collapse->testsuite_details = LAST_USER_CHOICE;
+$tlCfg->exec_cfg->expand_collapse
+                ->testplan_notes = 'LAST_USER_CHOICE';
+$tlCfg->exec_cfg->expand_collapse
+                ->platform_description = 'LAST_USER_CHOICE';
+$tlCfg->exec_cfg->expand_collapse
+                ->build_description = 'LAST_USER_CHOICE';
+$tlCfg->exec_cfg->expand_collapse
+                ->testsuite_details = 'LAST_USER_CHOICE';
 
 
 
@@ -2045,7 +2054,7 @@
 
 
 
-// ----------------------------------------------------------------------------
+// -------------------------------------------------------------
 /* [PROXY] */
 /* Used only */ 
 /* mantissoapInterface.class.php */
@@ -2060,22 +2069,23 @@
 /** Plugins feature */
 define('TL_PLUGIN_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR);
 
-// ----- End of Config ------------------------------------------------------------------
-// --------------------------------------------------------------------------------------
+// ----- End of Config ----------------------------------------
+
+// ------------------------------------------------------------
 // DO NOT DO CHANGES BELOW
-// --------------------------------------------------------------------------------------
+// ------------------------------------------------------------
 
 /** Functions for check request status */
 require_once('configCheck.php');
 
-
-if( !defined('TL_JQUERY') )
-{
-  define('TL_JQUERY','jquery-2.2.4.min.js' );
+/**
+ * @see also cfg/const.inc.php
+ */
+if (!defined('TL_JQUERY')) {
+  define('TL_JQUERY','third_party/jquery/jquery-3.4.1.min.js');
 }
 
-if( !defined('TL_DATATABLES_DIR') )
-{
+if (!defined('TL_DATATABLES_DIR')) {
   define('TL_DATATABLES_DIR','DataTables-1.10.4' );
 }
 
@@ -2085,9 +2095,8 @@
 define('TL_BASE_HREF', get_home_url(array('force_https' => $tlCfg->force_https)));
 
 clearstatcache();
-if ( file_exists( TL_ABS_PATH . 'custom_config.inc.php' ) )
-{
-  require_once( TL_ABS_PATH . 'custom_config.inc.php' );
+if ( file_exists( $cfgPath . 'custom_config.inc.php' ) ) {
+  require_once( $cfgPath . 'custom_config.inc.php' );
 }
 
 

error.php

@@ -6,53 +6,41 @@
  * General purpose error page.
  *
  * @package 	TestLink
- * @copyright 2012,2019 TestLink community
+ * @copyright 	2012 TestLink community
  *
  * @internal revisions
- * @used by: kinow - TICKET 4977 - CSRF - Advisory ID: HTB23088
+ * @since 1.9.4
+ *  20120703 - kinow - TICKET 4977 - CSRF - Advisory ID: HTB23088
  *
  **/
 
 require_once('config.inc.php');
 require_once('common.php');
 
-/**
- *
- */
-function init_args() {
-
-  $args = new stdClass();
-  $args->message = 'Rocket Raccoon is watching You';
-  $code = isset($_REQUEST['code']) ? $_REQUEST['code'] : 0;
-
-  switch($code) {
-    case 1:
-      $args->message = 'No CSRFName found, probable invalid request.';
-    break;
-
-    case 2:
-      $args->message = 'Invalid CSRF token';
-    break;
-
-    default:
-    break;    
-  } 
-
-  return $args;
+function init_args()
+{
+    $iParams = array(
+        'message' => array(tlInputParameter::STRING_N,0,255)
+    );
+    $pParams = R_PARAMS($iParams);
+    $args = new stdClass();
+    if(isset($pParams['message'])) {
+        $args->message = $pParams['message'];
+    }
+    return $args;
 }
 
-/**
- *
- */
-function init_gui($args) {
-  $gui = new stdClass();
-  $gui->message = '';
-
-  if(isset($args->message) {
-    $gui->message = $args->message;
-  }
-
-  return $gui;
+function init_gui($args)
+{
+    $gui = new stdClass();
+    if(isset($args->message))
+    {
+        $gui->message = $args->message;
+    } else {
+        $gui->message = '';
+    }
+
+    return $gui;
 }
 
 $templateCfg = templateConfiguration();
@@ -61,4 +49,6 @@ function init_gui($args) {
 
 $smarty = new TLSmarty();
 $smarty->assign('gui', $gui);
-$smarty->display($templateCfg->default_template);
+$smarty->display($templateCfg->default_template);
+
+?>

firstLogin.php

@@ -5,9 +5,10 @@
  *
  * @filesource  firstLogin.php
  * @package     TestLink
- * @copyright   2004-2019, TestLink community 
+ * @copyright   2004-2016, TestLink community 
  * @link        http://www.testlink.org
  *
+ *
  */
 require_once('config.inc.php');
 require_once('common.php');
@@ -20,7 +21,8 @@
 $args = init_args();
 $gui = $args;
 
-if (!config_get('user_self_signup')) {
+if (!config_get('user_self_signup'))
+{
   $smarty = new TLSmarty();
   $smarty->assign('title', lang_get('fatal_page_title'));
   $smarty->assign('content', lang_get('error_self_signup_disabled'));
@@ -32,34 +34,45 @@
 doDBConnect($db,database::ONERROREXIT);
 
 $message = ''; //lang_get('your_info_please');
-if( !is_null($args->doEditUser) ) {
-  if(strcmp($args->password,$args->password2)) {
+if( !is_null($args->doEditUser) )
+{
+  if(strcmp($args->password,$args->password2))
+  {
     $message = lang_get('passwd_dont_match');
-  } else {
+  }
+  else
+  {
     $user = new tlUser(); 
     $rx = $user->checkPasswordQuality($args->password);
-    if( $rx['status_ok'] >= tl::OK ) {
+    if( $rx['status_ok'] >= tl::OK )
+    {
       $result = $user->setPassword($args->password);
-      if ($result >= tl::OK) {
+      if ($result >= tl::OK)
+      {
         $user->login = $args->login;
         $user->emailAddress = $args->email;
         $user->firstName = $args->firstName;
         $user->lastName = $args->lastName;
         $result = $user->writeToDB($db);
 
         $cfg = config_get('notifications');
-        if($cfg->userSignUp->enabled) {  
+        if($cfg->userSignUp->enabled)
+        {  
           notifyGlobalAdmins($db,$user);
         }
         logAuditEvent(TLS("audit_users_self_signup",$args->login),"CREATE",$user->dbID,"users");
 
         $url2go = "login.php?viewer={$gui->viewer}&note=first";
         redirect(TL_BASE_HREF . $url2go);
         exit();
-      } else {
+      }
+      else 
+      {
         $message = getUserErrorMessage($result);
       } 
-    } else {
+    }  
+    else
+    {
       $message = $rx['msg'];
     }  
   }
@@ -72,11 +85,11 @@
 $gui->message = $message;
 $smarty->assign('gui',$gui);
 
-$tpl = str_replace('.php','.tpl',basename($_SERVER['SCRIPT_NAME']));
+// $tpl = str_replace('.php','.tpl',basename($_SERVER['SCRIPT_NAME']));
 if( $args->viewer == 'new' ) {
-  $tpl='firstLogin-model-marcobiedermann.tpl';
+  $tpl='login/firstLogin-model-marcobiedermann.tpl';
 }  
-$tpl = 'login/' . $tpl;
+
 $smarty->display($tpl);