BUG 9881 PM 2.0.44 testing 3. Al enviar una combinacion invalidad de parametros a PMFNewCase() se vence la sesion del usuario.

PROBLEM  The session vars were replaced with invalid values.
SOLUTION Restore the session vars with healty values.

workflow/engine/bin/tasks/cliWorkspaces.php

@@ -52,7 +52,6 @@ EOT
 );
 CLI::taskArg('workspace', false);
 CLI::taskArg('backup-file', true);
-CLI::taskOpt("filesize", "Set the max size of the compresed splitted files, by default the max is 1000 Mb.", "s:","filesize=");
 CLI::taskRun(run_workspace_backup);
 
 CLI::taskName('workspace-restore');
@@ -71,12 +70,11 @@ CLI::taskArg('backup-file', false);
 CLI::taskArg('workspace', true);
 CLI::taskOpt("overwrite", "If a workspace already exists, overwrite it.", "o", "overwrite");
 CLI::taskOpt("info", "Only shows information about a backup archive.", "i");
-CLI::taskOpt("multiple", "Restore from multiple compresed enumerated files.", "m");
 CLI::taskOpt("workspace", "Select which workspace to restore if multiple workspaces are present in the archive.",
              "w:", "workspace=");
 CLI::taskRun(run_workspace_restore);
 
-CLI::taskName('cacheview-rep air');
+CLI::taskName('cacheview-repair');
 CLI::taskDescription(<<<EOT
   Create and populate the APP_CACHE_VIEW table
 
@@ -376,29 +374,14 @@ function run_workspace_backup($args, $opts) {
     if (!$workspace->workspaceExists())
       throw new Exception("Workspace '{$workspace->name}' not found");
   //If this is a relative path, put the file in the backups directory
-  if (strpos($filename, "/") === false && strpos($filename, '\\') === false){
+  if (strpos($filename, "/") === false && strpos($filename, '\\') === false)
     $filename = PATH_DATA . "backups/$filename";
-  }
   CLI::logging("Backing up to $filename\n");
+  $backup = workspaceTools::createBackup($filename);
 
-  $filesize = array_key_exists("filesize", $opts) ? $opts['filesize'] : -1;
+  foreach ($workspaces as $workspace)
-  if($filesize >= 0)
+    $workspace->backup($backup);
-  {
-      $multipleBackup = new MultipleFilesBackup ($filename,$filesize);//if filesize is 0 the default size will be took
-      //using new method
-      foreach ($workspaces as $workspace){
-          $multipleBackup->addToBackup($workspace);
-      }
-      $multipleBackup->letsBackup();
-  }
-  else
-  {
-    //ansient method to backup into one large file
-    $backup = workspaceTools::createBackup($filename);
 
-    foreach ($workspaces as $workspace)
-      $workspace->backup($backup);
-  }
   CLI::logging("\n");
   workspaceTools::printSysInfo();
   foreach ($workspaces as $workspace) {
@@ -422,15 +405,8 @@ function run_workspace_restore($args, $opts) {
     CLI::logging("Restoring from $filename\n");
     $workspace = array_key_exists("workspace", $opts) ? $opts['workspace'] : NULL;
     $overwrite = array_key_exists("overwrite", $opts);
-    $multiple = array_key_exists("multiple", $opts);
     $dstWorkspace = $args[1];
-//echo "filename: ".$filename." workspace:".$workspace." dts:".$dstWorkspace." over:".$overwrite." multiple:".$multiple."\n";
+    workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite);
-    if(!empty($multiple)){
-        MultipleFilesBackup::letsRestore ($filename,$workspace,$dstWorkspace,$overwrite);
-    }
-    else{
-        workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite);
-    }
   }
 }
 

workflow/engine/classes/class.wsBase.php

@@ -76,7 +76,7 @@ class wsBase
 {
     public $stored_system_variables; //boolean
     public $wsSessionId; //web service session id, if the wsbase function is used from a WS request
-    private $originalValues = array ();  // SESSION temporary array store.
+    private $originalValues = array (); // SESSION temporary array store.
 
     public function __construct ($params = null)
     {

workflow/engine/classes/class.wsTools.php

@@ -54,7 +54,7 @@ class workspaceTools {
      *
      * @param   bool $first true if this is the first workspace to be upgrade
      */
-    public function upgrade($first=false, $buildCacheView=false, $workSpace=SYS_SYS) 
+    public function upgrade($first=false, $buildCacheView=false, $workSpace=SYS_SYS)
     {
         $start = microtime(true);
         CLI::logging("> Updating database...\n");
@@ -292,15 +292,12 @@ class workspaceTools {
      */
     public function upgradeContent($workSpace=SYS_SYS) {
         $this->initPropel(true);
-        require_once('classes/model/Language.php');
+        require_once 'classes/model/Translation.php';
-        G::LoadThirdParty('pear/json', 'class.json');
+        $translation = new Translation();
-        $lang = array();
+        $information = $translation->getTranslationEnvironments();
-        foreach (System::listPoFiles() as $poFile) {
+        $arrayLang = array();
-            $poName = basename($poFile);
+        foreach ($information as $key => $value) {
-            $names = explode(".", basename($poFile));
+            $arrayLang[] = trim($value['LOCALE']);
-            $extension = array_pop($names);
-            $langid = array_pop($names);
-            $arrayLang[] = $langid;
         }
         require_once('classes/model/Content.php');
         $regenerateContent = new Content();
@@ -871,6 +868,7 @@ class workspaceTools {
     //Remove leftovers.
     G::rm_dir($tempDirectory);
   }
+
   //TODO: Move to class.dbMaintenance.php
   /**
    * create a user in the database
@@ -1116,225 +1114,4 @@ class workspaceTools {
   }
 
 }
-
-
-/** Class MultipleFilesBackup
-* create a backup of this workspace
-*
-* Exports the database and copies the files to an tar archive o several if the max filesize is reached. 
-* 
-*/
-class MultipleFilesBackup{
-
-  private $dir_to_compress = "";
-  private $filename = "backUpProcessMaker.tar";
-  private $fileSize = "1000"; // 1 GB by default.
-  private $sizeDescriptor = "m"; //megabytes
-  private $tempDirectories=array();
-  
-  /* Constructor 
-  *  @filename contains the path and filename of the comppress file(s).
-  *  @size     got the Max size of the compressed files, by default if the $size less to zero will mantains 1000 Mb as Max size.
-  */
-  function MultipleFilesBackup($filename,$size)
-  {
-    if(!empty($filename)){
-        $this->filename = $filename;
-    }
-    if(!empty($size) && (int)$size > 0){
-        $this->fileSize = $size;
-    }
-  }
-  /* Gets workspace information enough to make its backup.
-  *  @workspace contains the workspace to be add to the commpression process.
-  */
-  public function addToBackup($workspace)
-  {
-    //verifing if workspace exists.
-    if (!$workspace->workspaceExists()) {
-      echo "Workspace {$workspace->name} not found\n";
-      return false;
-    }
-    //create destination path
-    if (!file_exists(PATH_DATA . "upgrade/")){
-      mkdir(PATH_DATA . "upgrade/");
-    }
-    $tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
-    mkdir($tempDirectory);
-    $metadata = $workspace->getMetadata();
-    CLI::logging("Temporing up database...\n");
-    $metadata["databases"] = $workspace->exportDatabase($tempDirectory);
-    $metadata["directories"] = array("{$workspace->name}.files");
-    $metadata["version"] = 1;
-    $metaFilename = "$tempDirectory/{$workspace->name}.meta";
-    if (!file_put_contents($metaFilename,
-      str_replace(array(",", "{", "}"), array(",\n  ", "{\n  ", "\n}\n"),
-                  G::json_encode($metadata)))) {
-      CLI::logging("Could not create backup metadata");
-    }
-    CLI::logging("Adding database to backup...\n");
-    $this->addToBackup($tempDirectory);
-    CLI::logging("Adding files to backup...\n");
-    $this->addToBackup($workspace->path);
-    $this->tempDirectories[] = $tempDirectory;
-  }
-  
-  /* Add a directory containing Db files or info files to be commpressed
-  *  @directory the name and path of the directory to be add to the commpression process.
-  */
-  private function addToBackup($directory)
-  {
-    if(!empty($directory)){
-        $this->dir_to_compress .= $directory . " ";
-    }
-  }
-  
-  /* Commpress the DB and files into a single or several files with numerical series extentions
-  */
-  public function letsBackup()
-  {
-    // creating command
-    $CommpressCommand = "tar czv ";
-    $CommpressCommand .= $this->dir_to_compress;
-    $CommpressCommand .= "| split -b ";
-    $CommpressCommand .= $this->fileSize;
-    $CommpressCommand .= "m -d - ";
-    $CommpressCommand .= $this->filename . ".";
-    //executing command to create the files
-    echo exec($CommpressCommand);
-    //Remove leftovers dirs.
-    foreach($this->tempDirectories as $tempDirectory)
-    {
-        CLI::logging("Deleting: ".$tempDirectory."\n");
-        G::rm_dir($tempDirectory);
-    }
-  }
-  /* Restore from file(s) commpressed by letsBackup function, into a temporary directory
-  *  @ filename     got the name and path of the compressed file(s), if there are many files with file extention as a numerical series, the extention should be discriminated.
-  *  @ srcWorkspace contains the workspace to be restored.
-  *  @ dstWorkspace contains the workspace to be overwriting.
-  *  @ overwrite    got the option true if the workspace will be overwrite.
-  */
-  static public function letsRestore($filename, $srcWorkspace, $dstWorkspace = NULL, $overwrite = true)
-  {
-    // Needed info:
-    // TEMPDIR  /shared/workflow_data/upgrade/
-    // BACKUPS  /shared/workflow_data/backups/
-    
-    // Creating command  cat myfiles_split.tgz_* | tar xz
-    $DecommpressCommand = "cat " . $filename . ".* ";
-    $DecommpressCommand .= " | tar xzv";
-    
-    $tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
-    $parentDirectory = PATH_DATA . "upgrade";
-    if (is_writable($parentDirectory)) {
-        mkdir($tempDirectory);
-    } else {
-        throw new Exception("Could not create directory:" . $parentDirectory);
-    }
-    //Extract all backup files, including database scripts and workspace files
-    CLI::logging("Restoring into ".$tempDirectory."\n");
-    chdir($tempDirectory);
-    echo exec($DecommpressCommand);
-    CLI::logging("\nUncompressed into: ".$tempDirectory."\n");
-
-    //Search for metafiles in the new standard (the old standard would contain meta files.
-    $metaFiles = glob($tempDirectory . "/*.meta");
-    if (empty($metaFiles)) {
-      $metaFiles = glob($tempDirectory . "/*.txt");
-      if (!empty($metaFiles)){
-        return workspaceTools::restoreLegacy($tempDirectory);
-      }
-      else{
-        throw new Exception("No metadata found in backup");
-      }
-    } 
-    else {
-      CLI::logging("Found " . count($metaFiles) . " workspaces in backup:\n");
-      foreach ($metaFiles as $metafile){
-        CLI::logging("-> " . basename($metafile) . "\n");
-      }
-    }
-    if (count($metaFiles) > 1 && (!isset($srcWorkspace))){
-      throw new Exception("Multiple workspaces in backup but no workspace specified to restore");
-    }
-    if (isset($srcWorkspace) && !in_array("$srcWorkspace.meta", array_map(basename, $metaFiles))){
-      throw new Exception("Workspace $srcWorkspace not found in backup");
-    }
-    foreach ($metaFiles as $metaFile) {
-      $metadata = G::json_decode(file_get_contents($metaFile));
-      if ($metadata->version != 1){
-        throw new Exception("Backup version {$metadata->version} not supported");
-      }
-      $backupWorkspace = $metadata->WORKSPACE_NAME;
-      if (isset($dstWorkspace)) {
-        $workspaceName = $dstWorkspace;
-        $createWorkspace = true;
-      } 
-      else {
-        $workspaceName = $metadata->WORKSPACE_NAME;
-        $createWorkspace = false;
-      }
-      if (isset($srcWorkspace) && strcmp($metadata->WORKSPACE_NAME, $srcWorkspace) != 0) {
-        CLI::logging(CLI::warning("> Workspace $backupWorkspace found, but not restoring.") . "\n");
-        continue;
-      } 
-      else {
-        CLI::logging("> Restoring " . CLI::info($backupWorkspace) . " to " . CLI::info($workspaceName) . "\n");
-      }
-      $workspace = new workspaceTools($workspaceName);
-      if ($workspace->workspaceExists()){
-        if ($overwrite){
-          CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n");
-        }
-        else{
-          throw new Exception("Destination workspace already exist (use -o to overwrite)");
-        }
-      }
-      if (file_exists($workspace->path)) {
-        G::rm_dir($workspace->path);
-      }
-      foreach ($metadata->directories as $dir) {
-        CLI::logging("+> Restoring directory '$dir'\n");
-        if (!rename("$tempDirectory/$dir", $workspace->path)) {
-          throw new Exception("There was an error copying the backup files ($tempDirectory/$dir) to the workspace directory {$workspace->path}.");
-        }
-      }
-
-      CLI::logging("> Changing file permissions\n");
-      $shared_stat = stat(PATH_DATA);
-      if ($shared_stat !== false){
-        workspaceTools::dirPerms($workspace->path, $shared_stat['uid'], $shared_stat['gid'], $shared_stat['mode']);
-      }
-      else{
-        CLI::logging(CLI::error ("Could not get the shared folder permissions, not changing workspace permissions") . "\n");
-      }
-
-      list($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
-
-      CLI::logging("> Connecting to system database in '$dbHost'\n");
-      $link = mysql_connect($dbHost, $dbUser, $dbPass);
-      @mysql_query("SET NAMES 'utf8';");
-      if (!$link){
-        throw new Exception('Could not connect to system database: ' . mysql_error());
-      }
-
-      $newDBNames = $workspace->resetDBInfo($dbHost, $createWorkspace);
-
-      foreach ($metadata->databases as $db) {
-        $dbName = $newDBNames[$db->name];
-        CLI::logging("+> Restoring database {$db->name} to $dbName\n");
-        $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql");
-        $workspace->createDBUser($dbName, $db->pass, "localhost", $dbName);
-        $workspace->createDBUser($dbName, $db->pass, "%", $dbName);
-      }
-      $workspace->upgradeCacheView(false);
-      mysql_close($link);
-
-    }
-    CLI::logging("Removing temporary files\n");
-    G::rm_dir($tempDirectory);
-    CLI::logging(CLI::info("Done restoring") . "\n");
-  }
-}
 ?>