diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index e44dee37a..3500c550e 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -15,7 +15,14 @@ fields. - fix [ 1275024 ] Can not edit layout on 6.7.2 - fix [ 1262235 ] sql report form params - + - fix [ 1277529 ] Extra radio buttons in Settings console + - Removed the last remnants of wobject ids. + - Fixed a GUID case sensitivity problem. + - Fixed several large security holes. See the security advisory on + getwebgui.com for details. + - fix [ 1279157 ] showInForms option not stored + - fix [ 1250290 ] ECommerce state field broken on Plainblack.com + - fix [ 1261985 ] (Fix?) sortby.lastreply.url (Andreas Graf) 6.7.2 diff --git a/docs/migration.txt b/docs/migration.txt index b9ae5553c..237668a12 100644 --- a/docs/migration.txt +++ b/docs/migration.txt @@ -177,6 +177,17 @@ slightly. In most situations the changes will not cause any problems, but for some asset developers there may be a slight change. +1.6 Binary GUIDs + +In 6.7.3 we noticed a problem with the GUID system. MySQL by default reads +varchar fields as case insensitive, which can cause a big overlap problem for +assetIds, userIds, and anything else that uses GUIDs. Therefore you need to +alter all your custom tables and add the binary operator to the GUID field +definitions like so: + +alter table MyTable change assetId assetId binary not null; + + 2. Macro Migration ------------------- diff --git a/docs/upgrades/upgrade_6.7.2-6.7.3.pl b/docs/upgrades/upgrade_6.7.2-6.7.3.pl index a20f86849..ff1f23309 100644 --- a/docs/upgrades/upgrade_6.7.2-6.7.3.pl +++ b/docs/upgrades/upgrade_6.7.2-6.7.3.pl @@ -10,12 +10,226 @@ my $quiet; start(); deleteOldHelpFiles(); +setGuidsBinary(); finish(); -#------------------------------------------------- -#sub fixSomething { -# print "\tFixing ....\n" unless ($quiet); + +#------------------------------------------------- +sub setGuidsBinary { + print "\tSetting GUIDs to have binary flag in database.\n" unless ($quiet); + my @sql = ( + "alter table asset change assetId assetId varchar(22) binary not null", + "alter table asset change parentId parentId varchar(22) binary not null", + "alter table asset change createdBy createdBy varchar(22) binary not null default '3'", + "alter table asset change stateChangedBy stateChangedBy varchar(22) binary not null default '3'", + "alter table asset change isLockedBy isLockedBy varchar(22) binary", + "alter table wobject change assetId assetId varchar(22) binary not null", + "alter table wobject change printableStyleTemplateId printableStyleTemplateId varchar(22) binary not null", + "alter table wobject change styleTemplateId styleTemplateId varchar(22) binary not null", + "alter table users change userId userId varchar(22) binary not null", + "alter table users change referringAffiliate referringAffiliate varchar(22) binary not null", + "alter table userSessionScratch change sessionId sessionId varchar(22) binary not null", + "alter table userSession change sessionId sessionId varchar(22) binary not null", + "alter table userSession change userId userId varchar(22) binary not null", + "alter table userLoginLog change userId userId varchar(22) binary not null", + "alter table userProfileCategory change profileCategoryId profileCategoryId varchar(22) binary not null", + "alter table userProfileData change userId userId varchar(22) binary not null", + "alter table userProfileField change profileCategoryId profileCategoryId varchar(22) binary not null", + "alter table template change assetId assetId varchar(22) binary not null", + "alter table transaction change transactionId transactionId varchar(22) binary not null", + "alter table transaction change userId userId varchar(22) binary not null", + "alter table transactionItem change transactionId transactionId varchar(22) binary not null", + "alter table subscriptionCode change batchId batchId varchar(22) binary not null", + "alter table subscriptionCode change code code varchar(64) binary not null", + "alter table subscriptionCode change usedBy usedBy varchar(22) binary not null", + "alter table subscriptionCodeBatch change batchId batchId varchar(22) binary not null", + "alter table subscriptionCodeBatch change subscriptionId subscriptionId varchar(22) binary not null", + "alter table subscriptionCodeSubscriptions change subscriptionId subscriptionId varchar(22) binary not null", + "alter table subscriptionCodeSubscriptions change code code varchar(64) binary not null", + "alter table subscription change subscriptionId subscriptionId varchar(22) binary not null", + "alter table subscription change subscriptionGroup subscriptionGroup varchar(22) binary not null", + "alter table snippet change assetId assetId varchar(22) binary not null", + "alter table shoppingCart change sessionId sessionId varchar(22) binary not null", + "alter table shoppingCart change itemId itemId varchar(64) binary not null", + "alter table transactionItem change itemId itemId varchar(64) binary not null", + "alter table replacements change replacementId replacementId varchar(22) binary not null", + "alter table redirect change assetId assetId varchar(22) binary not null", + "alter table products change productId productId varchar(22) binary not null", + "alter table products change templateId templateId varchar(22) binary not null", + "alter table productVariants change variantId variantId varchar(22) binary not null", + "alter table productVariants change productId productId varchar(22) binary not null", + "alter table passiveProfileAOI change userId userId varchar(22) binary not null", + "alter table passiveProfileAOI change fieldId fieldId varchar(22) binary not null", + "alter table passiveProfileLog change passiveProfileLogId passiveProfileLogId varchar(22) binary not null", + "alter table passiveProfileLog change userId userId varchar(22) binary not null", + "alter table passiveProfileLog change sessionId sessionId varchar(22) binary not null", + "alter table passiveProfileLog change wobjectId assetId varchar(22) binary not null", + "alter table passiveProfileLog change dateOfEntry dateOfEntry bigint not null", + "alter table productParameterOptions change optionId optionId varchar(22) binary not null", + "alter table productParameterOptions change parameterId parameterId varchar(22) binary not null", + "alter table productParameters change parameterId parameterId varchar(22) binary not null", + "alter table productParameters change productId productId varchar(22) binary not null", + "alter table metaData_values change fieldId fieldId varchar(22) binary not null", + "alter table metaData_values change assetId assetId varchar(22) binary not null", + "alter table metaData_properties change fieldId fieldId varchar(22) binary not null", + "alter table messageLog change messageLogId messageLogId varchar(22) binary not null", + "alter table messageLog change userId userId varchar(22) binary not null", + "alter table ldapLink change ldapLinkId ldapLinkId varchar(22) binary not null", + "alter table ldapLink change ldapAccountTemplate ldapAccountTemplate varchar(22) binary not null", + "alter table ldapLink change ldapCreateAccountTemplate ldapCreateAccountTemplate varchar(22) binary not null", + "alter table ldapLink change ldapLoginTemplate ldapLoginTemplate varchar(22) binary not null", + "alter table groups change groupId groupId varchar(22) binary not null", + "alter table groups change databaseLinkId databaseLinkId varchar(22) binary not null", + "alter table karmaLog change dateModified dateModified bigint not null", + "alter table karmaLog change userId userId varchar(22) binary not null", + "alter table databaseLink change databaseLinkId databaseLinkId varchar(22) binary not null", + "alter table groupGroupings change groupId groupId varchar(22) binary not null", + "alter table groupGroupings change inGroup inGroup varchar(22) binary not null", + "alter table groupings change groupId groupId varchar(22) binary not null", + "alter table groupings change expireDate expireDate bigint not null default 2114402400", + "alter table groupings change userId userId varchar(22) binary not null", + "alter table authentication change userId userId varchar(22) binary not null", + "alter table assetVersionTag change tagId tagId varchar(22) binary not null", + "alter table assetVersionTag change createdBy createdBy varchar(22) binary not null", + "alter table assetVersionTag change committedBy committedBy varchar(22) binary not null", + "alter table assetHistory change assetId assetId varchar(22) binary not null", + "alter table assetHistory change userId userId varchar(22) binary not null", + "alter table assetData change assetId assetId varchar(22) binary not null", + "alter table assetData change revisedBy revisedBy varchar(22) binary not null", + "alter table assetData change tagId tagId varchar(22) binary not null", + "alter table assetData change ownerUserId ownerUserId varchar(22) binary not null", + "alter table assetData change groupIdEdit groupIdEdit varchar(22) binary not null", + "alter table assetData change groupIdView groupIdView varchar(22) binary not null", + "alter table Thread change assetId assetId varchar(22) binary not null", + "alter table Thread change lastPostId lastPostId varchar(22) binary not null", + "alter table Thread change subscriptionGroupId subscriptionGroupId varchar(22) binary not null", + "alter table WSClient change assetId assetId varchar(22) binary not null", + "alter table WSClient change templateId templateId varchar(22) binary not null", + "alter table SyndicatedContent change assetId assetId varchar(22) binary not null", + "alter table SyndicatedContent change templateId templateId varchar(22) binary not null", + "alter table Survey_section change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_section change Survey_sectionId Survey_sectionId varchar(22) binary not null", + "alter table Survey_response change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_response change startDate startDate bigint not null", + "alter table Survey_response change endDate endDate bigint not null", + "alter table Survey_response change Survey_responseId Survey_responseId varchar(22) binary not null", + "alter table Survey_question change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_question change Survey_questionId Survey_questionId varchar(22) binary not null", + "alter table Survey_question change Survey_sectionId Survey_sectionId varchar(22) binary not null", + "alter table Survey_questionResponse change dateOfResponse dateOfResponse bigint not null", + "alter table Survey_questionResponse change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_questionResponse change Survey_questionId Survey_questionId varchar(22) binary not null", + "alter table Survey_questionResponse change Survey_answerId Survey_answerId varchar(22) binary not null", + "alter table Survey_questionResponse change Survey_responseId Survey_responseId varchar(22) binary not null", + "alter table Survey change assetId assetId varchar(22) binary not null", + "alter table Survey change groupToViewReports groupToViewReports varchar(22) binary not null default '3'", + "alter table Survey change groupToTakeSurvey groupToTakeSurvey varchar(22) binary not null default '2'", + "alter table Survey change responseTemplateId responseTemplateId varchar(22) binary not null", + "alter table Survey change overviewTemplateId overviewTemplateId varchar(22) binary not null", + "alter table Survey change gradebookTemplateId gradebookTemplateId varchar(22) binary not null", + "alter table Survey change templateId templateId varchar(22) binary not null", + "alter table Survey change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_answer change Survey_id Survey_id varchar(22) binary not null", + "alter table Survey_answer change Survey_questionId Survey_questionId varchar(22) binary not null", + "alter table Survey_answer change Survey_answerId Survey_answerId varchar(22) binary not null", + "alter table Survey_answer change gotoQuestion gotoQuestion varchar(22) binary not null", + "alter table RichEdit change assetId assetId varchar(22) binary not null", + "alter table SQLReport change assetId assetId varchar(22) binary not null", + "alter table SQLReport change templateId templateId varchar(22) binary not null", + "alter table SQLReport change databaseLinkId1 databaseLinkId1 varchar(22) binary not null", + "alter table SQLReport change databaseLinkId2 databaseLinkId2 varchar(22) binary not null", + "alter table SQLReport change databaseLinkId3 databaseLinkId3 varchar(22) binary not null", + "alter table SQLReport change databaseLinkId4 databaseLinkId4 varchar(22) binary not null", + "alter table SQLReport change databaseLinkId5 databaseLinkId5 varchar(22) binary not null", + "alter table Shortcut change assetId assetId varchar(22) binary not null", + "alter table Shortcut change templateId templateId varchar(22) binary not null", + "alter table Shortcut change overrideTemplateId overrideTemplateId varchar(22) binary not null", + "alter table Shortcut change shortcutToAssetId shortcutToAssetId varchar(22) binary not null", + "alter table Product_feature change assetId assetId varchar(22) binary not null", + "alter table Product_feature change Product_featureId Product_featureId varchar(22) binary not null", + "alter table Product_related change assetId assetId varchar(22) binary not null", + "alter table Product_related change relatedAssetId relatedAssetId varchar(22) binary not null", + "alter table Product_specification change Product_specificationId Product_specificationId varchar(22) binary not null", + "alter table Product_specification change assetId assetId varchar(22) binary not null", + "alter table Product change assetId assetId varchar(22) binary not null", + "alter table Product change templateId templateId varchar(22) binary not null", + "alter table Product_accessory change assetId assetId varchar(22) binary not null", + "alter table Product_accessory change accessoryAssetId accessoryAssetId varchar(22) binary not null", + "alter table Product_benefit change assetId assetId varchar(22) binary not null", + "alter table Product_benefit change Product_benefitId Product_benefitId varchar(22) binary not null", + "alter table Post change assetId assetId varchar(22) binary not null", + "alter table Post change threadId threadId varchar(22) binary not null", + "alter table Post change storageId storageId varchar(22) binary not null", + "alter table Post_rating change assetId assetId varchar(22) binary not null", + "alter table Post_rating change userId userId varchar(22) binary not null", + "alter table Post_read change threadId threadId varchar(22) binary not null", + "alter table Post_read change userId userId varchar(22) binary not null", + "alter table Post_read change postId postId varchar(22) binary not null", + "alter table Poll change assetId assetId varchar(22) binary not null", + "alter table Poll change templateId templateId varchar(22) binary not null", + "alter table Poll_answer change assetId assetId varchar(22) binary not null", + "alter table Poll_answer change userId userId varchar(22) binary not null", + "alter table Layout change assetId assetId varchar(22) binary not null", + "alter table Layout change templateId templateId varchar(22) binary not null", + "alter table MessageBoard change assetId assetId varchar(22) binary not null", + "alter table MessageBoard change templateId templateId varchar(22) binary not null", + "alter table Navigation change assetId assetId varchar(22) binary not null", + "alter table Navigation change templateId templateId varchar(22) binary not null", + "alter table ITransact_recurringStatus change initDate initDate bigint not null", + "alter table ITransact_recurringStatus change lastTransaction lastTransaction bigint not null", + "alter table ImageAsset change assetId assetId varchar(22) binary not null", + "alter table FileAsset change assetId assetId varchar(22) binary not null", + "alter table FileAsset change templateId templateId varchar(22) binary not null", + "alter table FileAsset change storageId storageId varchar(22) binary not null", + "alter table Folder change assetId assetId varchar(22) binary not null", + "alter table Folder change templateId templateId varchar(22) binary not null", + "alter table HttpProxy change assetId assetId varchar(22) binary not null", + "alter table HttpProxy change templateId templateId varchar(22) binary not null", + "alter table HttpProxy change cookieJarStorageId cookieJarStorageId varchar(22) binary not null", + "alter table EventsCalendar change assetId assetId varchar(22) binary not null", + "alter table EventsCalendar change templateId templateId varchar(22) binary not null", + "alter table EventsCalendar_event change assetId assetId varchar(22) binary not null", + "alter table EventsCalendar_event change templateId templateId varchar(22) binary not null", + "alter table EventsCalendar_event change EventsCalendar_recurringId EventsCalendar_recurringId varchar(22) binary not null", + "alter table DataForm change assetId assetId varchar(22) binary not null", + "alter table DataForm change templateId templateId varchar(22) binary not null", + "alter table DataForm change emailTemplateId emailTemplateId varchar(22) binary not null", + "alter table DataForm change acknowlegementTemplateId acknowlegementTemplateId varchar(22) binary not null", + "alter table DataForm change listTemplateId listTemplateId varchar(22) binary not null", + "alter table DataForm_entry change assetId assetId varchar(22) binary not null", + "alter table DataForm_entry change DataForm_entryId DataForm_entryId varchar(22) binary not null", + "alter table DataForm_entry change submissionDate submissionDate bigint not null", + "alter table DataForm_entry change userId userId varchar(22) binary not null", + "alter table DataForm_entryData change assetId assetId varchar(22) binary not null", + "alter table DataForm_entryData change DataForm_entryId DataForm_entryId varchar(22) binary not null", + "alter table DataForm_entryData change DataForm_fieldId DataForm_fieldId varchar(22) binary not null", + "alter table DataForm_field change assetId assetId varchar(22) binary not null", + "alter table DataForm_field change DataForm_tabId DataForm_tabId varchar(22) binary not null", + "alter table DataForm_field change DataForm_fieldId DataForm_fieldId varchar(22) binary not null", + "alter table DataForm_tab change assetId assetId varchar(22) binary not null", + "alter table DataForm_tab change DataForm_tabId DataForm_tabId varchar(22) binary not null", + "alter table Article change assetId assetId varchar(22) binary not null", + "alter table Article change templateId templateId varchar(22) binary not null", + "alter table Collaboration change assetId assetId varchar(22) binary not null", + "alter table Collaboration change threadTemplateId threadTemplateId varchar(22) binary not null", + "alter table Collaboration change postGroupId postGroupId varchar(22) binary not null default '2'", + "alter table Collaboration change moderateGroupId moderateGroupId varchar(22) binary not null default '4'", + "alter table Collaboration change collaborationTemplateId collaborationTemplateId varchar(22) binary not null", + "alter table Collaboration change threadTemplateId threadTemplateId varchar(22) binary not null", + "alter table Collaboration change postFormTemplateId postFormTemplateId varchar(22) binary not null", + "alter table Collaboration change searchTemplateId searchTemplateId varchar(22) binary not null", + "alter table Collaboration change notificationTemplateId notificationTemplateId varchar(22) binary not null", + "alter table Collaboration change lastPostId lastPostId varchar(22) binary", + "alter table Collaboration change subscriptionGroupId subscriptionGroupId varchar(22) binary", + "alter table Collaboration change richEditor richEditor varchar(22) binary not null default 'PBrichedit000000000002'" + ); + foreach my $query (@sql) { + WebGUI::SQL->write($query); + } +} + +#------------------------------------------------- sub deleteOldHelpFiles { my @dupes = qw/Article Collaboration DataForm EventsCalendar File Folder Survey HttpProxy IndexedSearch Image Layout MessageBoard Navigation Poll Post Product @@ -27,7 +241,7 @@ sub deleteOldHelpFiles { foreach my $dir ("Help/", "i18n/English/") { my $file = join '', $path, $dir, $dupe, '.pm'; my $files_deleted = unlink($file); - print("\t\tUnable to delete $file: $!\n") unless $quiet or $files_deleted; + print("\t\tUnable to delete $file: $!\n") unless $quiet or $files_deleted or $! eq "No such file or directory"; } } } diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 3fd30b7cb..95da9b80a 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -292,21 +292,18 @@ sub getEditForm { -namespace=>"EventsCalendar/Event", -label=>WebGUI::International::get(530,"Asset_Event"), -hoverHelp=>WebGUI::International::get('530 description',"Asset_Event"), - -afterEdit=>'func=edit;wid='.$self->get("wobjectId") ); # $tabform->getTab("display")->template( # -name=>"regNotifyTemplateId", # -value=>$self->getValue("regNotifyTemplateId"), # -namespace=>"EventsCalendar/Event", # -label=>WebGUI::International::get(531,"Asset_Event"), -# -afterEdit=>'func=edit;wid='.$self->get("wobjectId") # ); # $tabform->getTab("display")->template( # -name=>"reminderTemplateId", # -value=>$self->getValue("reminderTemplateId"), # -namespace=>"EventsCalendar/Event", # -label=>WebGUI::International::get(532,"Asset_Event"), -# -afterEdit=>'func=edit;wid='.$self->get("wobjectId") # ); # $tabform->getTab("security")->group( # -name=>"groupCanRegister", -label=>WebGUI::International::get(533,"Asset_Event"), diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm index 3534a9284..1cd9d136f 100644 --- a/lib/WebGUI/Asset/Template.pm +++ b/lib/WebGUI/Asset/Template.pm @@ -114,7 +114,6 @@ sub definition { defaultValue=>1 }, showInForms=>{ - noFormPost=>1, fieldType=>'yesNo', defaultValue=>1 }, diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 57d3728a9..9c16cb708 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -890,7 +890,7 @@ sub view { $var{'sortby.title.url'} = $self->getSortByUrl("title"); $var{'sortby.username.url'} = $self->getSortByUrl("username"); $var{'sortby.date.url'} = $self->getSortByUrl("dateSubmitted"); - $var{'sortby.lastreply.url'} = $self->getSortByUrl("lastUpdated"); + $var{'sortby.lastreply.url'} = $self->getSortByUrl("lastPostDate"); $var{'sortby.views.url'} = $self->getSortByUrl("views"); $var{'sortby.replies.url'} = $self->getSortByUrl("replies"); $var{'sortby.rating.url'} = $self->getSortByUrl("rating"); diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm index 3ad7172c7..c733e8180 100644 --- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm @@ -131,7 +131,6 @@ sub getEditForm { -label=>WebGUI::International::get(80,"Asset_EventsCalendar"), -value=>$self->getValue('eventTemplateId'), -namespace=>"EventsCalendar/Event", - -afterEdit=>'func=edit;wid='.$self->get("wobjectId") ); $tabform->getTab("display")->selectList( -name=>"startMonth", diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 0eaa7ae08..b8c303ace 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -288,7 +288,7 @@ sub getEditForm { -hoverHelp => WebGUI::International::get('13 description','Asset_Survey'), -value => [$self->getValue("groupToViewReports")] ); - if ($self->get("wobjectId") eq "new") { + if ($self->get("assetId") eq "new") { $tabform->getTab('properties')->whatNext( -options=>{ addQuestion=>WebGUI::International::get(28,'Asset_Survey'), @@ -810,8 +810,8 @@ sub www_editAnswer { $answer = $self->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid}); $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f->hidden( - -name => "wid", - -value => $session{form}{wid} + -name => "assetId", + -value => $session{form}{assetId} ); $f->hidden( -name => "func", @@ -913,8 +913,8 @@ sub www_editQuestion { $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f->hidden( - -name => "wid", - -value => $self->get("wobjectId") + -name => "assetId", + -value => $self->get("assetId") ); $f->hidden( -name => "func", @@ -1080,8 +1080,8 @@ sub www_editSection { $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f->hidden( - -name => "wid", - -value => $self->get("wobjectId") + -name => "assetId", + -value => $self->get("assetId") ); $f->hidden( -name => "func", diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm index e084fbc14..c04a1b840 100644 --- a/lib/WebGUI/Commerce/Payment/ITransact.pm +++ b/lib/WebGUI/Commerce/Payment/ITransact.pm @@ -805,7 +805,7 @@ sub validateFormData { push (@error, $i18n->get('invalid lastName')) unless ($session{form}{lastName}); push (@error, $i18n->get('invalid address')) unless ($session{form}{address}); push (@error, $i18n->get('invalid city')) unless ($session{form}{city}); - push (@error, $i18n->get('invalid zip')) unless ($session{form}{zipcode}); + push (@error, $i18n->get('invalid zip')) if ($session{form}{zipcode} eq "" && $session{form}{country} eq "United States"); push (@error, $i18n->get('invalid email')) unless ($session{form}{email}); push (@error, $i18n->get('invalid card number')) unless ($session{form}{cardNumber} =~ /^\d+$/); diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index e1ca05f31..789ea98c4 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -327,8 +327,8 @@ our $HELP = { namespace => 'WebGUI', }, { - title => 'Enable Metadata ?', - description => 'Enable Metadata ? description', + title => 'Enable Metadata', + description => 'Enable Metadata description', namespace => 'WebGUI', }, { @@ -432,8 +432,8 @@ our $HELP = { namespace => 'WebGUI', }, { - title => 'Enable passive profiling ?', - description => 'Enable passive profiling ? description', + title => 'Enable passive profiling', + description => 'Enable passive profiling description', namespace => 'WebGUI', }, { diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 33702d951..de504cdc7 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -108,7 +108,7 @@ sub www_editSettings { ); $tabform->getTab("content")->yesNo( -name=>"metaDataEnabled", - -label=>$i18n->get("Enable Metadata ?"), + -label=>$i18n->get("Enable Metadata"), -value=>$session{setting}{metaDataEnabled} ); # user interface settings @@ -224,7 +224,7 @@ sub www_editSettings { ); $tabform->getTab("user")->yesNo( -name=>"passiveProfilingEnabled", - -label=>$i18n->get("Enable passive profiling ?"), + -label=>$i18n->get("Enable passive profiling"), -value=>$session{setting}{passiveProfilingEnabled}, -extras=>' onChange="alert(\''.$i18n->get("Illegal Warning").'\')" ' ); diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm index 1653aa490..c3c366249 100644 --- a/lib/WebGUI/PassiveProfiling.pm +++ b/lib/WebGUI/PassiveProfiling.pm @@ -33,7 +33,7 @@ This package provides an interface to the passive profiling system. =head1 SYNOPSIS use WebGUI::PassiveProfiling; - WebGUI::PassiveProfiling::add( $wobjectId ); + WebGUI::PassiveProfiling::add( $assetId ); =head1 METHODS @@ -43,24 +43,24 @@ These functions/methods are available from this package: #------------------------------------------------------------------- -=head2 add ( wobjectId ) +=head2 add ( assetId ) -Adds a wobjectId to the passive profile log. +Adds a assetId to the passive profile log. -=head3 wobjectId +=head3 assetId -The wobjectId to add. +The assetId to add. =cut sub add { return unless ($session{setting}{passiveProfilingEnabled}); - my $wobjectId = shift; - my $sql = "insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, wobjectId, dateOfEntry) + my $assetId = shift; + my $sql = "insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry) values (".quote(WebGUI::Id::generate()).",". quote($session{user}{userId}).",". quote($session{var}{sessionId}).",". - quote($wobjectId).",". + quote($assetId).",". quote(WebGUI::DateTime::time()).")"; WebGUI::SQL->write($sql); return; @@ -98,7 +98,7 @@ is logged in the passiveProfileAOI table. =head3 hashRef -A hashRef with userId and wobjectId. +A hashRef with userId and assetId. =cut @@ -108,11 +108,11 @@ sub summarizeAOI { select f.fieldName, f.fieldType, d.fieldId, - d.wobjectId, + d.assetId, d.value from metaData_values d , metaData_properties f where f.fieldId = d.fieldId - and d.wobjectId = ".quote($data->{wobjectId}); + and d.assetId = ".quote($data->{assetId}); my $sth = WebGUI::SQL->read($sql); while (my $field = $sth->hashRef) { diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm index 07ac7ce36..cc08a6530 100644 --- a/lib/WebGUI/SQL.pm +++ b/lib/WebGUI/SQL.pm @@ -68,7 +68,7 @@ Package for interfacing with SQL databases. This package implements Perl DBI fun $dbh = WebGUI::SQL->getSlave; - $id = getNextId("wobjectId"); + $id = getNextId("someId"); $string = quote($string); =head1 METHODS diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 6ed952fe0..dfea3785e 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -3529,7 +3529,7 @@ Privileges and styles assigned to pages in the package will not be copied when t lastUpdated => 1120239343, }, - 'Enable Metadata ? description' => { + 'Enable Metadata description' => { message => q|This enables the metadata tab on Assets so that metadata can be entered and tracked by WebGUI.|, lastUpdated => 1120239343, @@ -3638,7 +3638,7 @@ Optionally, if you are running a sendmail server on the same machine as WebGUI, lastUpdated => 1120239343, }, - 'Enable passive profiling ? description' => { + 'Enable passive profiling description' => { message => q|Used in conjuction with Metadata, this keeps a record of every wobject viewed by a user.|, lastUpdated => 1120239343, @@ -3744,8 +3744,8 @@ Select which of the configured LDAP connections to use to authenticate users. lastUpdated => 1089039511 }, - 'Enable passive profiling ?' => { - message => q|Enable passive profiling ?|, + 'Enable passive profiling' => { + message => q|Enable passive profiling?|, lastUpdated => 1089039511 }, @@ -3856,8 +3856,8 @@ Message Boards hold forums for users. There are many different Wobjects in WebG lastUpdated => 1031514049 }, - 'Enable Metadata ?' => { - message => q|Enable Metadata ?|, + 'Enable Metadata' => { + message => q|Enable Metadata?|, lastUpdated => 1089039511 }, diff --git a/lib/WebGUI/i18n/English/Wobject.pm b/lib/WebGUI/i18n/English/Wobject.pm index aceacb27a..87c54bf5e 100644 --- a/lib/WebGUI/i18n/English/Wobject.pm +++ b/lib/WebGUI/i18n/English/Wobject.pm @@ -19,16 +19,16 @@ A conditional variable for whether or not the title should be displayed. The description of this wobject.

-wobjectId
-The unique identifier that WebGUI uses to control this wobject. +assetId
+The unique identifier that WebGUI uses to control this asset.

isShortcut
-A conditional indicating if this wobject is a shortcut to an original wobject. +A conditional indicating if this wobject is a shortcut to an original asset.

originalURL
-If this wobject is a shortcut, then this URL will direct you to the original wobject. +If this wobject is a shortcut, then this URL will direct you to the original asset. | },