View | Details | Raw Unified | Return to bug 140317
Collapse All | Expand All

(-)yast2-packagemanager-2.13.13/src/you/PMYouServers.cc.orig (-12 / +10 lines)
Lines 354-365 Link Here
354
    if ( product )
354
    if ( product )
355
    {
355
    {
356
	url = product->youUrl();
356
	url = product->youUrl();
357
	url += "?product=" + product->product();
357
	url += "?product=" + encodeUrl( product->product() );
358
	url += "&version=" + product->version();
358
	url += "&version=" + encodeUrl( product->version() );
359
	url += "&basearch=" + string( product->baseArch() );
359
	url += "&basearch=" + encodeUrl(string( product->baseArch() ) );
360
	url += "&arch=" + string( product->arch() );
360
	url += "&arch=" + encodeUrl( string( product->arch() ) ) ;
361
361
362
	url += "&lang=" + string( _settings->langCode().code() );
362
	url += "&lang=" + encodeUrl( string( _settings->langCode().code() ) );
363
363
364
	url += "&business=";
364
	url += "&business=";
365
	if ( product->businessProduct() ) url += "1";
365
	if ( product->businessProduct() ) url += "1";
Lines 369-375 Link Here
369
	if ( check ) url += "1";
369
	if ( check ) url += "1";
370
	else url += "0";
370
	else url += "0";
371
371
372
	url += "&distproduct=" + product->distProduct();
372
	url += "&distproduct=" + encodeUrl( product->distProduct() );
373
    }
373
    }
374
374
375
375
Lines 381-387 Link Here
381
    if (suse_release) {
381
    if (suse_release) {
382
	string release_line = stringutil::getline (suse_release, true);
382
	string release_line = stringutil::getline (suse_release, true);
383
	if (release_line.size() > 0) {
383
	if (release_line.size() > 0) {
384
	    url += "&suse-release=" + release_line;
384
	    url += "&suse-release=" + encodeUrl(release_line);
385
	}
385
	}
386
    }
386
    }
387
    }	// end of scope for suse_release, close stream
387
    }	// end of scope for suse_release, close stream
Lines 392-407 Link Here
392
392
393
    SysConfig clock( "clock" );
393
    SysConfig clock( "clock" );
394
    string timezone = clock.readEntry( "TIMEZONE" );
394
    string timezone = clock.readEntry( "TIMEZONE" );
395
    url += "&timezone=" + timezone;
395
    url += "&timezone=" + encodeUrl( timezone );
396
396
397
    SysConfig youcfg( "onlineupdate" );
397
    SysConfig youcfg( "onlineupdate" );
398
    if (youcfg.readBoolEntry("YOU_USE_MACHID", true))
398
    if (youcfg.readBoolEntry("YOU_USE_MACHID", true))
399
      {
399
      {
400
        url += "&machid=" + fetchMachID();
400
        url += "&machid=" + encodeUrl( fetchMachID() );
401
      }
401
      }
402
402
403
    url = encodeUrl( url );
404
405
    DBG << "url: '" << url << "'" << endl;
403
    DBG << "url: '" << url << "'" << endl;
406
404
407
    Pathname writeDir = _settings->localWriteDir();
405
    Pathname writeDir = _settings->localWriteDir();
Lines 550-556 Link Here
550
    if ( !pkg ) {
548
    if ( !pkg ) {
551
      WAR << "No installed object for " << pkgName << endl;
549
      WAR << "No installed object for " << pkgName << endl;
552
    } else {
550
    } else {
553
      url += "&" + pkgName + "=" + pkg->edition().asString();
551
      url += "&" + pkgName + "=" + encodeUrl( pkg->edition().asString() );
554
    }
552
    }
555
  }
553
  }
556
}
554
}

Return to bug 140317