diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 258eac8c9..774047ef7 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -57,6 +57,11 @@ workflow is unwanted. - fix: WebGUI::International::get can't handle spaces - fix: makePagePrintable macro uses style name instead of styleId + - fix: Tell A Friend + - Fixed a crash problem with Spectre run once cron jobs. + - Fixed a formatting problem and a data collision problem with the Create + Cron Job workflow activity. + - fix: HTML tags in subject 7.0.2 diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 79fd11917..e49af4d84 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -19,6 +19,10 @@ save you many hours of grief. If you're using this macro, you might need to increment the max parameter. + * We've made a number of improvements and bug fixes to the search + indexing system in this release. You may want to use the search.pl + utiltity in sbin to reindex your site to get better search results. + 7.0.2 -------------------------------------------------------------------- diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index d101b6015..7be14640b 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -120,7 +120,7 @@ CREATE TABLE `DataForm_field` ( `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL default '', PRIMARY KEY (`DataForm_fieldId`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -INSERT INTO `DataForm_field` VALUES ('1000',1,'from','required','email','','',0,'',0,1,'Your Email Address','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1001',2,'to','required','email','','',0,'',0,1,'Your Friends Email Address','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1002',3,'cc','hidden','email',NULL,NULL,0,NULL,NULL,1,'Cc','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1003',4,'bcc','hidden','email',NULL,NULL,0,NULL,NULL,1,'Bcc','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1004',5,'subject','hidden','text','','Cool CMS',0,'',0,1,'Subject','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1005',6,'url','visible','url','','http://www.plainblack.com/webgui',0,'',0,1,'URL','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1006',7,'message','required','textarea','','Hey I just wanted to tell you about this great program called WebGUI that I found: http://www.plainblack.com/webgui\r\n\r\nYou should really check it out.',34,'',6,0,'Message','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'); +INSERT INTO `DataForm_field` VALUES ('1000',1,'from','required','email','','',0,'',0,1,'Your Email Address','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1001',2,'to','required','email','','',0,'',0,1,'Your Friends Email Address','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1002',3,'cc','hidden','email',NULL,NULL,0,NULL,NULL,1,'Cc','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1003',4,'bcc','hidden','email',NULL,NULL,0,NULL,NULL,1,'Bcc','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1004',5,'subject','hidden','text','','Cool CMS',0,'',0,1,'Subject','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1005',6,'url','visible','url','','http://www.plainblack.com/webgui',0,'',0,1,'URL','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'),('1006',7,'message','required','textarea','','Hey I just wanted to tell you about this great program called WebGUI that I found: http://www.plainblack.com/webgui\r\n\r\nYou should really check it out.',300,'',100,0,'Message','0',1,NULL,'Szs5eev3OMssmnsyLRZmWA'); CREATE TABLE `DataForm_tab` ( `label` varchar(255) NOT NULL default '', `subtext` text, @@ -305,7 +305,7 @@ CREATE TABLE `ImageAsset` ( `revisionDate` bigint(20) NOT NULL default '0', PRIMARY KEY (`assetId`,`revisionDate`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -INSERT INTO `ImageAsset` VALUES ('7.0-style0000000000002',50,NULL,1147642492),('7.0-style0000000000004',50,NULL,1147642493),('7.0-style0000000000005',50,NULL,1147642493),('7.0-style0000000000006',50,NULL,1147642493),('7.0-style0000000000007',50,NULL,1147642493),('7.0-style0000000000008',50,NULL,1147642494),('7.0-style0000000000009',50,NULL,1147642494),('7.0-style0000000000010',50,NULL,1147642494),('7.0-style0000000000011',50,NULL,1147642495),('7.0-style0000000000012',50,NULL,1147642495),('7.0-style0000000000013',50,NULL,1147642495),('7.0-style0000000000014',50,NULL,1147642495),('7.0-style0000000000015',50,NULL,1147642496),('7.0-style0000000000016',50,NULL,1147642496),('7.0-style0000000000017',50,NULL,1147642496),('7.0-style0000000000018',50,NULL,1147642496),('7.0-style0000000000019',50,NULL,1147642497),('7.0-style0000000000020',50,NULL,1147642497),('7.0-style0000000000021',50,NULL,1147642497),('7.0-style0000000000022',50,NULL,1147642497),('7.0-style0000000000023',50,NULL,1147642498),('7.0-style0000000000024',50,NULL,1147642498),('7.0-style0000000000030',50,NULL,1147642499),('7.0-style0000000000032',50,NULL,1147642500),('7.0-style0000000000034',50,NULL,1147642500),('7.0-style0000000000035',50,NULL,1147642501),('7.0-style0000000000036',50,NULL,1147642501),('7.0-style0000000000037',50,NULL,1147642501),('7.0-style0000000000038',50,NULL,1147642501),('7.0-style0000000000039',50,NULL,1147642502),('7.0-style0000000000040',50,NULL,1147642502),('7.0-style0000000000041',50,NULL,1147642502),('7.0-style0000000000042',50,NULL,1147642502),('7.0-style0000000000043',50,NULL,1147642503),('7.0-style0000000000044',50,NULL,1147642503),('7.0-style0000000000045',50,NULL,1147642503),('7.0-style0000000000046',50,NULL,1147642504),('7.0-style0000000000048',50,NULL,1147642504),('7.0-style0000000000052',50,NULL,1147642505),('7.0-style0000000000053',50,NULL,1147642505),('7.0-style0000000000054',50,NULL,1147642506),('7.0-style0000000000055',50,NULL,1147642506),('7.0-style0000000000056',50,NULL,1147642506),('7.0-style0000000000057',50,NULL,1147642507),('7.0-style0000000000058',50,NULL,1147642507),('7.0-style0000000000059',50,NULL,1147642507),('7.0-style0000000000060',50,NULL,1147642508),('7.0-style0000000000061',50,NULL,1147642508),('7.0-style0000000000062',50,NULL,1147642508),('7.0-style0000000000063',50,NULL,1147642508),('7.0-style0000000000064',50,NULL,1147642509),('7.0-style0000000000065',50,NULL,1147642509),('7.0-style0000000000066',50,NULL,1147642509),('7.0-style0000000000067',50,NULL,1147642509),('7.0-style0000000000068',50,NULL,1147642510),('7.0-style0000000000071',50,NULL,1147642511); +INSERT INTO `ImageAsset` VALUES ('7.0-style0000000000002',50,NULL,1147642492),('7.0-style0000000000004',50,NULL,1147642493),('7.0-style0000000000005',50,NULL,1147642493),('7.0-style0000000000006',50,NULL,1147642493),('7.0-style0000000000007',50,NULL,1147642493),('7.0-style0000000000008',50,NULL,1147642494),('7.0-style0000000000009',50,NULL,1147642494),('7.0-style0000000000010',50,NULL,1147642494),('7.0-style0000000000011',50,NULL,1147642495),('7.0-style0000000000012',50,NULL,1147642495),('7.0-style0000000000013',50,NULL,1147642495),('7.0-style0000000000014',50,NULL,1147642495),('7.0-style0000000000015',50,NULL,1147642496),('7.0-style0000000000016',50,NULL,1147642496),('7.0-style0000000000017',50,NULL,1147642496),('7.0-style0000000000018',50,NULL,1147642496),('7.0-style0000000000019',50,NULL,1147642497),('7.0-style0000000000020',50,NULL,1147642497),('7.0-style0000000000021',50,NULL,1147642497),('7.0-style0000000000022',50,NULL,1147642497),('7.0-style0000000000023',50,NULL,1147642498),('7.0-style0000000000024',50,NULL,1147642498),('7.0-style0000000000030',50,NULL,1147642499),('7.0-style0000000000032',50,NULL,1147642500),('7.0-style0000000000034',50,NULL,1147642500),('7.0-style0000000000035',50,NULL,1147642501),('7.0-style0000000000036',50,NULL,1147642501),('7.0-style0000000000037',50,NULL,1147642501),('7.0-style0000000000038',50,NULL,1147642501),('7.0-style0000000000039',50,NULL,1147642502),('7.0-style0000000000040',50,NULL,1147642502),('7.0-style0000000000041',50,NULL,1147642502),('7.0-style0000000000042',50,NULL,1147642502),('7.0-style0000000000043',50,NULL,1147642503),('7.0-style0000000000044',50,NULL,1147642503),('7.0-style0000000000045',50,NULL,1147642503),('7.0-style0000000000046',50,NULL,1147642504),('7.0-style0000000000048',50,NULL,1147642504),('7.0-style0000000000052',50,NULL,1147642505),('7.0-style0000000000053',50,NULL,1147642505),('7.0-style0000000000054',50,NULL,1147642506),('7.0-style0000000000055',50,NULL,1147642506),('7.0-style0000000000056',50,NULL,1147642506),('7.0-style0000000000057',50,NULL,1147642507),('7.0-style0000000000058',50,NULL,1147642507),('7.0-style0000000000059',50,'alt=\"main_top.jpg\"',1147642507),('7.0-style0000000000060',50,NULL,1147642508),('7.0-style0000000000061',50,NULL,1147642508),('7.0-style0000000000062',50,NULL,1147642508),('7.0-style0000000000063',50,NULL,1147642508),('7.0-style0000000000064',50,NULL,1147642509),('7.0-style0000000000065',50,NULL,1147642509),('7.0-style0000000000066',50,NULL,1147642509),('7.0-style0000000000067',50,NULL,1147642509),('7.0-style0000000000068',50,NULL,1147642510),('7.0-style0000000000071',50,NULL,1147642511); CREATE TABLE `InOutBoard` ( `assetId` varchar(22) character set utf8 collate utf8_bin NOT NULL, `revisionDate` bigint(20) default NULL, @@ -1408,7 +1408,7 @@ CREATE TABLE `snippet` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; INSERT INTO `snippet` VALUES ('SynConXSLT000000000001','\n\n\n \n \n \n \n \n \nYou\'re viewing an RSS version 0.9 feed. Please use an RSS feed reader to view this content as intended.\n
\n
\n \n
\n
\n \n
\n
    \n \n
\n
\n \n \n
  • \n \n \n \n
    • \n     \n    ',0,'application/xml',1124395707,3600),('SynConXSLT000000000002','\n\n\n \n \n \n \n \n \n
    \nYou\'re viewing an RSS version 0.91 feed. Please use an RSS feed reader to view this content as intended.\n
    \n \n
    \n
    \n \n
    \n
      \n \n
    \n\n
    \n     \n \n
  • \n \n \n \n
    \n \n\n
    \n
    • \n     \n    ',0,'application/xml',1124395707,3600),('SynConXSLT000000000003','\n\n\n \n \n \n \n \n \n
    \nYou\'re viewing an RSS version 1.0 feed. Please use an RSS feed reader to view this content as intended.\n
    \n \n
    \n
    \n \n
    \n
      \n \n
    \n\n
    \n     \n \n
  • \n \n \n \n \n (\n )\n \n\n
    \n \n
    \n
    • \n     \n    \n',0,'application/xml',1124395707,3600),('SynConXSLT000000000004','\n\n\n \n \n \n \n \n \n
    \nYou\'re viewing an RSS version 2.0 feed. Please use an RSS feed reader to view this content as intended.\n
    \n \n
    \n
    \n \n
    \n
      \n \n
    \n\n
    \n     \n \n
  • \n \n \n \n \n ()\n \n\n
    \n \n
    \n
    • \n     \n    ',0,'application/xml',1124395707,3600),('7.0-style0000000000003','body, html\n{\n text-align:center;\n margin:0px;\n height:100%; \n background-color:#494949;\n}\n\n#main\n{\n width:800px;\n background: url(\'^FileUrl(style1/main_bg.jpg);\') repeat-y;\n height:100%;\n margin-left:auto;\n margin-right:auto;\n margin-top:0px;\n margin-bottom:0px;\n position:relative;\n}\nbody > #main\n{\n height:auto;\n min-height:100%;\n}\n\n#main #mainHeader\n{\n width:800px;\n height:133px;\n background: url(\'^FileUrl(style1/header.jpg);\') top left no-repeat;\n margin-bottom:0px;\n position:relative;\n}\n#main #mainHeader #title\n{\n position:absolute;\n top:23px;\n left:145px;\n font-size:32pt;\n font-family:arial;\n color:white;\n font-weight:bold;\n}\n#main #mainHeader #title a {\n color:white;\n text-decoration:none;\n}\n\n#main #mainContent\n{\n background: url(\'^FileUrl(style1/orange_left01.jpg);\') left top no-repeat;\n width:100%;\n height:100%; \n margin-top:0px;\n text-align:left;\n border:solid red 0px;\n}\n#main > #mainContent\n{\n margin-top:0px;\n min-height:500px;\n}\n#main > #mainContent > p {\n margin-top:0px;\n}\n#main #mainContent #mainText a:link {\n color:#FF7F23;\n}\n#main #mainContent #mainText a:visited {\n color:#D25900;\n}\n\n/* LEVEL 1 AND 2 NAVIGATION */\n#main .mainNav_1, #main .mainNav_2 {\n border-bottom:dashed #DADADA 1px; \n width:621px;\n height:25px;\n text-align:left;\n position:relative;\n margin-left:137px; \n clear:both;\n}\n#main .mainNav_1 a:link, #main .mainNav_1 a:visited, #main .mainNav_2 a:link, #main .mainNav_2 a:visited {\n color:white;\n text-decoration:none;\n top:5px;\n position:relative;\n -moz-box-sizing:border-box;\n}\n#main .mainNav_1 a:hover,#main .mainNav_2 a:hover {\n color:black;\n}\n#main .mainNav_1 div .left, #main .mainNav_2 div .left {\n width:12px;\n height:25px;\n display:block;\n float:left;\n background: url(\'^FileUrl(style1/nav1_off_left.jpg);\') no-repeat top left;\n}\n#main .mainNav_2 div .left {\n background: url(\'^FileUrl(style1/nav2_off_left.jpg);\') no-repeat top left;\n}\n#main .mainNav_1 div .center, #main .mainNav_2 div .center { \n height:25px;\n display:block;\n float:left;\n background: url(\'^FileUrl(style1/nav1_off_center.jpg);\') repeat-x top left;\n color:white;\n font-family:arial, verdana;\n font-size:8pt;\n}\n#main .mainNav_2 div .center {\n background: url(\'^FileUrl(style1/nav2_off_center.jpg);\') repeat-x top left;\n}\n#main .mainNav_1 div .right, #main .mainNav_2 div .right {\n width:10px;\n height:25px;\n display:block;\n float:left;\n background: url(\'^FileUrl(style1/nav1_off_right.jpg);\') no-repeat top left;\n}\n#main .mainNav_2 div .right {\n background: url(\'^FileUrl(style1/nav2_off_right.jpg);\') no-repeat top left;\n}\n#main .mainNav_1 div.navOn .left {\n background: url(\'^FileUrl(style1/nav1_on_left.jpg);\') no-repeat top left;\n}\n#main .mainNav_1 div.navOn .center {\n background: url(\'^FileUrl(style1/nav1_center_on.jpg);\') repeat-x top left;\n}\n#main .mainNav_1 div.navOn .right {\n background: url(\'^FileUrl(style1/nav1_on_right.jpg);\') no-repeat top left;\n}\n#main .mainNav_2 div.navOn .left {\n background: url(\'^FileUrl(style1/nav2_on_left.jpg);\') no-repeat top left;\n}\n#main .mainNav_2 div.navOn .center {\n background: url(\'^FileUrl(style1/nav2_center_on.jpg);\') repeat-x top left;\n}\n#main .mainNav_2 div.navOn .right {\n background: url(\'^FileUrl(style1/nav2_on_right.jpg);\') no-repeat top left;\n} \n#main .mainNav_1 div.navOn a:link, #main .mainNav_1 div.navOn a:visited, #main .mainNav_2 div.navOn a:link, #main .mainNav_2 div.navOn a:visited {\n color:black;\n}\n/* ENDOF LEVEL 1 AND 2 NAVIGATION */\n\n#main #crumbTrail {\n margin-left:177px;\n margin-bottom:0px;\n color:gray;\n font-size:8pt;\n font-weight:bold;\n}\n#main #crumbTrail a.crumbTrail:visited, #main #crumbTrail a.crumbTrail:link {\n color:silver;\n font-size:8pt; \n font-family:arial;\n text-decoration:none;\n font-weight:normal;\n}\n#main #crumbTrail a.crumbTrail:hover {\n color:gray;\n}\n\n#main #mainText\n{\n padding-left:150px;\n font-family:verdana;\n font-size:9pt;\n width:600px;\n margin-top:0px;\n}\n\n#main #gui\n{\n bottom:0px;\n left:0px;\n position:absolute;\n width:135px;\n font-size:8pt;\n color:black;\n font-family:arial;\n text-align:right;\n}\n#main #gui .loginBox {\n padding-right:12px;\n -moz-box-sizing:border-box;\n width:100px; \n float:right;\n margin-bottom:10px;\n}\n#main #gui .loginBox .loginBoxField {\n width:75px;\n}\n#main #gui .loginBox .loginBoxButton {\n background-color:#D65501;\n color:white;\n border:solid white 2px;\n margin-top:4px;\n font-variant:small-caps;\n}\n#main #gui a\n{\n color:white; \n}\n#copyright {\n color:#fff;\n position:absolute;\n top:110px;\n right:40px;\n font-family:verdana;\n font-size:8pt;\n font-weight:bold;\n background-color:#2D2D2D;\n opacity:0.4;\n -moz-opacity:0.4;\n -khtml-opacity:0.4; \n padding:2px;\n}\n* html #copyright {\n background: transparent;\n}\n',1,'text/css',1147642492,3600),('7.0-style0000000000033','body, html { \n height:100%; \n}\nbody {\n background:#7c9ab0 url(\'^FileUrl(style2/main_bg.jpg);\') repeat-y right; \n margin:0px;\n}\n.rightColumn {\n width:20%;\n height:100%;\n background: #eeeeee url(\'^FileUrl(style2/rightCol_bg.jpg);\') repeat-y right; \n text-align:center; \n}\n.rightColumn #pb_wg_bg {\n background: url(\'^FileUrl(style2/pb_wg_bg.jpg);\') repeat-x;\n width:100%;\n text-align:left; \n}\n.rightColumn #pb_wg {\n background: url(\'^FileUrl(style2/pb_wg.jpg);\') left no-repeat;\n height:53px;\n}\n.leftColumn { \n width:80%; \n background: white url(\'^FileUrl(style2/context_bg.jpg);\') repeat-y right; \n} \n.leftColumn #header {\n width:100%;\n background:#7c9ab0 url(\'^FileUrl(style2/leftCol_header.jpg);\') right no-repeat; \n height:86px;\n position:relative;\n}\n.leftColumn #header #title, .leftColumn #header #title_bg {\n color:white;\n font-size:36pt;\n font-weight:bold;\n font-family:arial;\n font-variant:small-caps;\n letter-spacing:12px;\n top:15px;\n left:5px;\n position:absolute;\n z-index:10;\n}\n.leftColumn #header #title a {\n color:white;\n text-decoration:none;\n}\n.leftColumn #header #title_bg {\n color:black;\n z-index:5;\n top:17px;\n left:7px;\n}\n.leftColumn #context {\n /*background: #fff url(\'^FileUrl(style2/context_bg.jpg);\') repeat-y right; */\n width:95%;\n font-family:verdana;\n font-size:9pt;\n color:#242424;\n -moz-box-sizing:border-box; \n position:relative;\n padding-left:1%;\n padding-right:1%;\n padding-bottom:15px;\n}\n.leftColumn #context a {\n color:#7C9AB0;\n font-weight:bold;\n}\n.leftColumn #context a:hover {\n text-decoration:none;\n}\n.leftColumn #pageTitleBG {\n background: url(\'^FileUrl(style2/page_title_bg.jpg);\') repeat-x; \n width:100%;\n}\n.leftColumn #pageTitleBG #pageTitle {\n background: url(\'^FileUrl(style2/page_title.jpg);\') right no-repeat; \n width:100%;\n height:50px;\n} \n.leftColumn #pageTitleBG #pageTitle h2 {\n font-size:14pt;\n color:#696969;\n font-family:arial;\n font-weight:normal;\n margin:0px;\n padding-top:2px;\n padding-left:25px;\n letter-spacing:3px;\n}\n.rightColumn #nav {\n width:85%;\n background: #b5b5b5 url(\'^FileUrl(style2/nav_bg.jpg);\') repeat-x top; \n border-right:solid #848484 1px;\n margin-left:auto;\n margin-right:auto;\n text-align:left;\n padding-left:3px;\n padding-top:7px;\n padding-bottom:7px;\n}\n.rightColumn #nav a {\n color:white;\n font-size:8pt;\n font-weight:bold;\n text-decoration:none;\n font-family:arial;\n line-height:8pt; \n} \n.rightColumn #nav .selectedMenuItem {\n color:yellow;\n}\n#loginStyles {\n font-size:8pt;\n font-family:arial;\n padding-bottom:25px;\n}\n#loginStyles a {\n color:#89ACCF;\n font-weight:bold; \n border-bottom:solid transparent 2px;\n text-decoration:none;\n}\n#loginStyles a:hover {\n border-bottom:dotted #B2C9D9 2px;\n} \n\n.copyright {\n border-top:solid silver 3px;\n background-color:gray;\n font-family:arial;\n font-size:9pt;\n color:silver; \n text-align:center;\n}\n',0,'text/css',1147642500,3600), ('7.0-style0000000000051','body, html {\n margin:0px;\n background-color:#b53018;\n padding:0px;\n}\n#main {\n width:98%;\n /*min-width:790px;*/\n margin:0px;\n padding:0px;\n padding-top:20px;\n padding-bottom:20px;\n position:relative;\n}\n#header { \n background: url(\'^FileUrl(style3/header_bg.jpg);\') repeat-x;\n width:100%;\n margin:0px; \n height:115px;\n}\n#headerTitle {\n background: url(\'^FileUrl(style3/header_left.jpg);\') no-repeat left top;\n height:100%;\n width:100%;\n}\n#headerRight {\n background: url(\'^FileUrl(style3/header_right.jpg);\') no-repeat right top;\n width:100%;\n height:100%;\n text-align:right;\n position:relative;\n}\n#headerRight #title {\n position:absolute;\n top:25px;\n left:20px;\n font-family:arial;\n text-align:left;\n}\n#title h1 {\n text-transform:uppercase; \n margin-bottom:0px; \n font-weight:normal;\n font-size:26pt;\n margin-top:0px;\n color:white;\n}\n#title h1 a {\n color:white;\n text-decoration:none;\n}\n#title h2 {\n margin:0px;\n font-size:12pt;\n color:#bebebe;\n padding-left:20px;\n}\n#title img {\n z-index:5;\n}\n#login {\n position:absolute;\n font-size:8pt;\n top:45%;\n right:150px; \n color:white;\n z-index:6;\n font-family:arial;\n}\n#login a {\n color:white;\n}\n.loginBox {\n font-size:8pt;\n margin:0px;\n display:inline;\n}\n.loginBox input {\n font-size:8pt;\n}\n\n#mainBody {\n width:100%;\n margin:0px;\n height:500px;\n background: #fff;\n position:relative;\n} \n#main > #mainBody {\n height:auto;\n min-height:500px;\n}\n#contentArea {\n z-index:2;\n position:relative;\n padding-top:50px;\n padding-left:10px;\n padding-right:20px;\n padding-bottom:20px;\n -moz-box-sizing:border:box;\n font-family:verdana;\n font-size:9pt;\n\n}\nhtml #main #mainBody #contentArea {\n height:1%;\n}\n#contentArea a {\n color:#EE963E;\n font-weight:bold;\n letter-spacing:1px;\n font-size:8pt;\n}\n#topCorner {\n width:100%;\n height:214px;\n position:absolute;\n top:0px;\n left:0px;\n background: url(\'^FileUrl(style3/main_top_bg.jpg);\') repeat-x;\n z-index:1;\n}\n#bottomCorner {\n width:100%;\n height:211px;\n position:absolute;\n bottom:0px;\n right:0px;\n background: url(\'^FileUrl(style3/main_bottom.jpg);\') no-repeat right;\n z-index:1;\n} \n\n#footer {\n width:100%;\n margin:0px;\n background:#000 url(\'^FileUrl(style3/footer_right.jpg);\') no-repeat right top;\n height:57px;\n border-top:solid #B53018 2px;\n text-align:right;\n position:relative;\n} \n#footer #copyright {\n color:#3b3b3b;\n font-family:arial;\n position:absolute;\n top:20px;\n left:30px;\n font-size:8pt;\n}\n\n',0,'text/css',1147642505,3600),('pbrobot000000000000001','User-agent: googlebot\nDisallow: *?op=displayLogin\nDisallow: *?op=makePrintable\n',0,'text/html',1147642511,3600), -('7.0-style0000000000051','body, html {\n margin:0px;\n background-color:#b53018;\n padding:0px;\n}\nbody a {\n color:#EE963E;font-weight:bold;\n letter-spacing:1px;\n font-size:8pt;\n}\n#main {\n width:98%;\n /*min-width:790px;*/\n margin:0px;\n padding:0px;\n padding-top:20px;\n padding-bottom:20px;\n position:relative;\n}\n#header { \n background: url(\'^FileUrl(style3/header_bg.jpg);\') repeat-x;\n width:100%;\n margin:0px;\n height:115px;\n}\n#headerTitle {\n background: url(\'^FileUrl(style3/header_left.jpg);\') no-repeat left top;\n height:100%;\n width:100%;\n}\n#headerRight {\n background: url(\'^FileUrl(style3/header_right.jpg);\') no-repeat right top;\n width:100%;\n height:100%;\n text-align:right;\n position:relative;\n}\n#headerRight #title {\n position:absolute;\n top:25px;\n left:20px;\n font-family:arial;\n text-align:left;\n}\n#title h1 {\n text-transform:uppercase;\n margin-bottom:0px;\n font-weight:normal;\n font-size:26pt;\n margin-top:0px;\n color:white;\n}\n#title h1 a {\n color:white;\n text-decoration:none;\n}\n#title h2 {\n margin:0px;\n font-size:12pt;\n color:#bebebe;\n padding-left:20px;\n}\n#title img {\n z-index:5;\n}\n#login {\n position:absolute;\n font-size:8pt;\n top:45%;\n right:150px;\n color:white;\n z-index:6;\n font-family:arial;\n}\n#login a {\n color:white;\n}\n.loginBox {\n font-size:8pt;\n margin:0px;\n display:inline;\n}\n.loginBox input {\n font-size:8pt;\n}\n\n#mainBody {\n width:100%;\n margin:0px;\n height:500px;\n background: #fff;\n position:relative;\n}\n#main > #mainBody {\n height:auto;\n min-height:500px;\n}\n#contentArea {\n z-index:2;\n position:relative;\n padding-top:50px;\n padding-left:10px;\n padding-right:20px;\n padding-bottom:20px;\n -moz-box-sizing:border:box;\n font-family:verdana;\n font-size:9pt;\n\n}\nhtml #main #mainBody #contentArea {\n height:1%;\n}\n#topCorner {\n width:100%;\n height:214px;\n position:absolute;\n top:0px;\n left:0px;\n background: url(\'^FileUrl(style3/main_top_bg.jpg);\') repeat-x;\n z-index:1;\n}\n#bottomCorner {\n width:100%;\n height:211px;\n position:absolute;\n bottom:0px;\n right:0px;\n background: url(\'^FileUrl(style3/main_bottom.jpg);\') no-repeat right;\n z-index:1;\n}\n\n#footer {\n width:100%;\n margin:0px;\n background:#000 url(\'^FileUrl(style3/footer_right.jpg);\') no-repeat right top;\n height:57px;\n border-top:solid #B53018 2px;\n text-align:right;\n position:relative;\n}\n#footer #copyright {\n color:#3b3b3b;\n font-family:arial;\n position:absolute;\n top:20px;\n left:30px;\n font-size:8pt;\n}\n',0,'text/css',1149286280,3600); +('7.0-style0000000000051','body, html {\n margin:0px;\n background-color:#b53018;\n padding:0px;\n}\nbody a {\n color:#EE963E;font-weight:bold;\n letter-spacing:1px;\n font-size:8pt;\n}\n#main {\n width:98%;\n /*min-width:790px;*/\n margin:0px;\n padding:0px;\n padding-top:20px;\n padding-bottom:20px;\n position:relative;\n}\n#header { \n background: url(\'^FileUrl(style3/header_bg.jpg);\') repeat-x;\n width:100%;\n margin:0px;\n height:115px;\n}\n#headerTitle {\n background: url(\'^FileUrl(style3/header_left.jpg);\') no-repeat left top;\n height:100%;\n width:100%;\n}\n#headerRight {\n background: url(\'^FileUrl(style3/header_right.jpg);\') no-repeat right top;\n width:100%;\n height:100%;\n text-align:right;\n position:relative;\n}\n#headerRight #title {\n position:absolute;\n top:25px;\n left:20px;\n font-family:arial;\n text-align:left;\n}\n#title h1 {\n text-transform:uppercase;\n margin-bottom:0px;\n font-weight:normal;\n font-size:26pt;\n margin-top:0px;\n color:white;\n}\n#title h1 a {\n color:white;\n text-decoration:none; font-size: 26pt; font-weight: normal; \n}\n#title h2 {\n margin:0px;\n font-size:12pt;\n color:#bebebe;\n padding-left:20px;\n}\n#title img {\n z-index:5;\n}\n#login {\n position:absolute;\n font-size:8pt;\n top:45%;\n right:150px;\n color:white;\n z-index:6;\n font-family:arial;\n}\n#login a {\n color:white; font-weight: normal; letter-spacing: 0px;\n}\n.loginBox {\n font-size:8pt;\n margin:0px;\n display:inline;\n}\n.loginBox input {\n font-size:8pt;\n}\n\n#mainBody {\n width:100%;\n margin:0px;\n height:500px;\n background: #fff;\n position:relative;\n}\n#main > #mainBody {\n height:auto;\n min-height:500px;\n}\n#contentArea {\n z-index:2;\n position:relative;\n padding-top:50px;\n padding-left:10px;\n padding-right:20px;\n padding-bottom:20px;\n -moz-box-sizing:border:box;\n font-family:verdana;\n font-size:9pt;\n\n}\nhtml #main #mainBody #contentArea {\n height:1%;\n}\n#topCorner {\n width:100%;\n height:214px;\n position:absolute;\n top:0px;\n left:0px;\n background: url(\'^FileUrl(style3/main_top_bg.jpg);\') repeat-x;\n z-index:1;\n}\n#bottomCorner {\n width:100%;\n height:211px;\n position:absolute;\n bottom:0px;\n right:0px;\n background: url(\'^FileUrl(style3/main_bottom.jpg);\') no-repeat right;\n z-index:1;\n}\n\n#footer {\n width:100%;\n margin:0px;\n background:#000 url(\'^FileUrl(style3/footer_right.jpg);\') no-repeat right top;\n height:57px;\n border-top:solid #B53018 2px;\n text-align:right;\n position:relative;\n}\n#footer #copyright {\n color:#3b3b3b;\n font-family:arial;\n position:absolute;\n top:20px;\n left:30px;\n font-size:8pt;\n}\n',0,'text/css',1149286280,3600); CREATE TABLE `subscription` ( `subscriptionId` varchar(22) character set utf8 collate utf8_bin NOT NULL default '', `name` varchar(128) default NULL, diff --git a/docs/upgrades/upgrade_7.0.2-7.0.3.pl b/docs/upgrades/upgrade_7.0.2-7.0.3.pl index 105253286..429b10e5d 100644 --- a/docs/upgrades/upgrade_7.0.2-7.0.3.pl +++ b/docs/upgrades/upgrade_7.0.2-7.0.3.pl @@ -12,7 +12,8 @@ use lib "../../lib"; use strict; use Getopt::Long; use WebGUI::Session; - +use WebGUI::Asset; +use WebGUI::HTML; my $toVersion = "7.0.3"; # make this match what version you're going to my $quiet; # this line required @@ -23,10 +24,22 @@ my $session = start(); # this line required deleteTemplate(); addConfigOption(); +fixPostSubjects(); finish($session); # this line required +#------------------------------------------------- +sub fixPostSubjects { + print "\tRemoving HTML from CS Post subjects.\n" unless ($quiet); + my $write = $session->db->prepare("update assetData set title=? where assetId=? and revisionDate=?"); + my $sth = $session->db->read("select title, asset.assetId, assetData.revisionDate from assetData left join asset on assetData.assetId=asset.assetId where asset.className like 'WebGUI::Asset::Post%'"); + while (my $row = $sth->arrayRef) { + $row->[0] = WebGUI::HTML::filter($row->[0], "all"); + $write->execute($row); + } +} + #------------------------------------------------- sub addConfigOption { print "\tAdding save and commit option.\n" unless ($quiet); diff --git a/lib/Spectre/Cron.pm b/lib/Spectre/Cron.pm index 16e1a73a0..89ffd7582 100644 --- a/lib/Spectre/Cron.pm +++ b/lib/Spectre/Cron.pm @@ -425,28 +425,34 @@ sub runJobResponse { my $id = $request->header("X-jobId"); # got to figure out how to get this from the request, cuz the response may die $self->debug("Response retrieved is for job $id."); if ($response->is_success) { - $self->debug("Response for job $id retrieved successfully."); - if ($response->header("Set-Cookie") ne "") { - $self->debug("Storing cookie for $id for later use."); - my $cookie = $response->header("Set-Cookie"); - $cookie =~ s/wgSession=([a-zA-Z0-9\_\-]{22}).*/$1/; - $self->{_cookies}{$self->getJob($id)->{sitename}} = $cookie; - } - my $state = $response->content; - if ($state eq "done") { - delete $self->{_errorCount}{$id}; - $self->debug("Job $id is now complete."); - if ($self->getJob($id)->{runOnce}) { - $kernel->yield("deleteJob",$id); + my $job = $self->getJob($id); + if (defined $job && ref $job eq "HASH") { + $self->debug("Response for job $id retrieved successfully."); + if ($response->header("Set-Cookie") ne "") { + $self->debug("Storing cookie for $id for later use."); + my $cookie = $response->header("Set-Cookie"); + $cookie =~ s/wgSession=([a-zA-Z0-9\_\-]{22}).*/$1/; + $self->{_cookies}{$job->{sitename}} = $cookie; + } + my $state = $response->content; + if ($state eq "done") { + delete $self->{_errorCount}{$id}; + $self->debug("Job $id is now complete."); + if ($job->{runOnce}) { + $kernel->yield("deleteJob",$id); + } + } elsif ($state eq "error") { + $self->{_errorCount}{$id}++; + $self->debug("Got an error response for job $id, will try again in ".$self->config->get("suspensionDelay")." seconds."); + $kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id); + } else { + $self->{_errorCount}{$id}++; + $self->error("Something bad happened on the return of job $id, will try again in ".$self->config->get("suspensionDelay")." seconds. ".$response->error_as_HTML); + $kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id); } - } elsif ($state eq "error") { - $self->{_errorCount}{$id}++; - $self->debug("Got an error response for job $id, will try again in ".$self->config->get("suspensionDelay")." seconds."); - $kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id); } else { $self->{_errorCount}{$id}++; - $self->error("Something bad happened on the return of job $id, will try again in ".$self->config->get("suspensionDelay")." seconds. ".$response->error_as_HTML); - $kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id); + $self->error("Job $id is not in our queue."); } } elsif ($response->is_redirect) { $self->error("Response for $id was redirected. This should never happen if configured properly!!!"); diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 3b87baea8..0f298d66c 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -299,7 +299,10 @@ Returns the extraHeadTags stored in the asset. Called in $self->session->style- sub getExtraHeadTags { my $self = shift; - return $self->get("extraHeadTags")."\n".$self->getShortcut->get("extraHeadTags"); + my $output = $self->get("extraHeadTags")."\n"; + my $shortcut = $self->getShortcut; + $output .= $self->getShortcut->get("extraHeadTags") if defined $shortcut; + return $output; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Operation/Workflow.pm b/lib/WebGUI/Operation/Workflow.pm index 893c71068..bbbb9b961 100644 --- a/lib/WebGUI/Operation/Workflow.pm +++ b/lib/WebGUI/Operation/Workflow.pm @@ -115,7 +115,6 @@ sub www_deleteWorkflowActivity { my $workflow = WebGUI::Workflow->new($session, $session->form->get("workflowId")); if (defined $workflow) { $workflow->deleteActivity($session->form->get("activityId")); - $workflow->set({enabled=>0}); } return www_editWorkflow($session); } diff --git a/lib/WebGUI/Workflow/Activity/CreateCronJob.pm b/lib/WebGUI/Workflow/Activity/CreateCronJob.pm index 303eef968..4e53e525f 100644 --- a/lib/WebGUI/Workflow/Activity/CreateCronJob.pm +++ b/lib/WebGUI/Workflow/Activity/CreateCronJob.pm @@ -69,7 +69,7 @@ sub definition { label=>$i18n->get("run once"), hoverHelp=>$i18n->get("run once help") }, - workflowId=>{ + workflowIdToRun=>{ fieldType=>"workflow", defaultValue=>undef, label=>$i18n->get("workflow"), @@ -137,7 +137,7 @@ sub execute { title=>"Generated by workflow instance ".$instance->getId." (".$self->get("title").")", enabled=>$self->get("enabled"), runOnce=>$self->get("runOnce"), - workflowId=>$self->get("workflowId"), + workflowId=>$self->get("workflowIdToRun"), priority=>$self->get("priority"), minuteOfHour=>$self->get("minuteOfHour"), hourOfDay=>$self->get("hourOfDay"),