| \r\n |
| \r\n |
| \"> | \r\n \"> |
| \n | |||||||||||||
| Header \n | \n \n | ||||||||||||
| \r\n \r\n \r\n | \r\n\r\n \r\n \"> \r\n \r\n \r\n |
\n\n\n \">\n \n\n \n \n \n\n - \n\n
| \"> | \r\n \"> |
| \r\n |
| \"> | \r\n \"> |
\r\n
|
| \"> | \r\n \"> |
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n|||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n \"> | \r\n \"> | \r\n ||||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
Features | ![](\"^Extras;spacer.gif\"){kind=spacer} | Benefits | | Specifications | | Accessories | |
\r\n \r\n | \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
| \r\n\r\nFeatures \r\n \r\n \r\n \r\n | \r\n \r\n\r\nSpecifications \r\n \r\n \r\n \r\n \r\n \r\n | \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
| \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n \r\n \r\n \r\n \r\n \r\n \r\n |
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
| \r\n \"> | \r\n\r\n \r\n | \r\n||
| \r\n | \r\n \r\n | \r\n \r\n ^D(\"%z %Z\", | \r\n \r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
\r\n
| \" class=\"pollColor\"> | \r\n | \r\n
| \r\n | \r\n |
| Entry ID | \nSubmission Date | \n|
| \"> | \n
| \n | ||||||
| \n \"> \n | \n \n \"> | \n
| \r\n |
| \n | \n \n | \n | \n
| \"> | \n \"> | \n
| \r\n |
| \r\n |
| \r\n |
| \r\n |
\">\r\n
| \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n \r\n | \r\n\r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
\r\n\r\n
| \r\n | \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\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
| \r\n | \r\n \r\n \r\n | \r\n
| \r\n | \r\n
You searched for
| \n | \n $ | \n \"> | \n
| \n | Product | \nQuantity | \nPrice | \n
|---|---|---|---|
| \n | \n | Total | \n
| \n | |||||||||||||
| Header \n | \n \n | ||||||||||||
| \r\n | \r\n \r\n | \r\n
Results
\r\n
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
| Date Posted | \r\n|
| Location | \r\n|
| Compensation | \r\n|
| Views | \r\n
| \r\n |
| \r\n |
| \r\n |
| \r\n |
| \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n | \r\n
| \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n |
\n
![](\"^Extras;/styles/webgui6/wg_logo.gif\"){kind=logo} | \r\n ^L(\"17\",\"\",\"PBtmpl0000000000000092\"); ^AdminToggle; | \r\n![](\"^Extras;/styles/webgui6/wg_box_top.gif\") | \r\n
\n \r\n![\"home\"](\"^Extras;/styles/webgui6/icon_home.gif\" "\\"Go"){kind=icon} \n ![\"Email\"](\"^Extras;/styles/webgui6/icon_email.gif\" "\\"Email"){kind=icon} \r\n![\"Print\"](\"^Extras;/styles/webgui6/icon_print.gif\" "\\"Make"){kind=icon} \n ![\"Site](\"^Extras;/styles/webgui6/icon_site_map.gif\" "\\"View"){kind=icon} ![\"Plain](\"^Extras;/styles/webgui6/icon_pb.gif\" "\\"Visit"){kind=icon} \r\n | \r\n \r\n ^Spacer(56,1);![](\"^Extras;/styles/webgui6/txt_the_last.gif\") ^Spacer(26,1);![](\"^Extras;/styles/webgui6/wg_box_bottom.gif\") | \r\n
| ^Spacer(53,59); | \r\n^D(\"%c %D, %y\"); | \r\n![](\"^Extras;/styles/webgui6/date_right_shadow.gif\") | \r\n ^PageTitle; | \r\n ^Spacer(53,59); | \r\n
| ^Spacer(53,1); | \r\n \r\n\r\n \r\n^AssetProxy(\"flexmenu_1002\");\r\n \r\n ![](\"^Extras;/styles/webgui6/powered_by_aqua_blue.gif\") \r\n | \r\n\r\n ![](\"^Extras;/styles/webgui6/lnav_shadow.jpg\") | \r\n \r\n \n | \r\n ^Spacer(53,1); | \r\n
![](\"^Extras;/styles/webgui6/footer.jpg\") | \r\n
![](\"^Extras;/styles/webgui6/logo_pb.gif\"){kind=logo} Design by Plain Black | \r\n
![](\"^Extras;plainblack.gif\")
\r\n
\r\n
\r\n
| \r\n\"> | \r\n\"> | \r\n
| Transaction description | \r\nPrice | \r\nStatus | \r\nError | \r\n
|---|---|---|---|
| Product | \nQuantity | \nPrice | \nEach | \n
|---|---|---|---|
| \n | Subtotal | \n||
| Shipping | \n|||
| Total | \n
| $ | \r\n ||||
| $ | \r\n
![\"?\"](\"^Extras;/adminConsole/small/help.gif\")
\r\n ![\"*\"](\"^Extras;/adminConsole/medalian.gif\")
\r\n| \n | \n \n \n | \n
| \r\n |
| \"> | \r\n \"> |
| \n | |||||||||||||
| Header \n | \n \n | ||||||||||||
| \r\n \r\n \r\n | \r\n\r\n \r\n \"> \r\n \r\n \r\n |
\n\n\n \">\n \n\n \n \n \n\n - \n\n
| \"> | \r\n \"> |
| \r\n |
| \"> | \r\n \"> |
\r\n
|
| \"> | \r\n \"> |
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n|||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
\r\n
| \"> | \r\n \"> | \r\n \"> | \r\n \"> | \r\n \"> | \r\n ||||
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
Features | | Benefits | | Specifications | | Accessories | |
\r\n \r\n | \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
| \r\n\r\nFeatures \r\n \r\n \r\n \r\n | \r\n \r\n\r\nSpecifications \r\n \r\n \r\n \r\n \r\n \r\n | \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
| \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n | \r\n \r\n \r\n \r\n \r\n \r\n \r\n |
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
| \r\n \"> | \r\n\r\n \r\n | \r\n||
| \r\n | \r\n \r\n | \r\n \r\n ^D(\"%z %Z\", | \r\n \r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
\r\n
| \" class=\"pollColor\"> | \r\n | \r\n
| \r\n | \r\n |
| Entry ID | \nSubmission Date | \n|
| \"> | \n
| \n | ||||||
| \n \"> \n | \n \n \"> | \n
| \r\n |
| \n | \n \n | \n | \n
| \"> | \n \"> | \n
| \r\n |
| \r\n |
| \r\n |
| \r\n |
\">\r\n
| \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n \r\n | \r\n\r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\n
\r\n\r\n
| \r\n | \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n | \r\n
| \r\n | \r\n \r\n | \r\n \r\n | \r\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
| \r\n | \r\n \r\n \r\n | \r\n
| \r\n | \r\n
You searched for
| \n | \n $ | \n \"> | \n
| \n | Product | \nQuantity | \nPrice | \n
|---|---|---|---|
| \n | \n | Total | \n
| \n | |||||||||||||
| Header \n | \n \n | ||||||||||||
| \r\n | \r\n \r\n | \r\n
Results
\r\n
| oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n oddThread | \r\n
| Date Posted | \r\n|
| Location | \r\n|
| Compensation | \r\n|
| Views | \r\n
| \r\n |
| \r\n |
| \r\n |
| \r\n |
| \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n \r\n | \r\n
| \r\n | \r\n | \r\n
| \r\n |
| \r\n | \r\n \r\n | \r\n
| \r\n |
\n
| \r\n ^L(\"17\",\"\",\"PBtmpl0000000000000092\"); ^AdminToggle; | \r\n | \r\n
| \n \r\n \n \r\n \n \r\n | \r\n \r\n ^Spacer(56,1);^Spacer(26,1); | \r\n
| ^Spacer(53,59); | \r\n^D(\"%c %D, %y\"); | \r\n | \r\n ^PageTitle; | \r\n ^Spacer(53,59); | \r\n
| ^Spacer(53,1); | \r\n \r\n\r\n \r\n^AssetProxy(\"flexmenu_1002\");\r\n \r\n \r\n | \r\n\r\n | \r\n \r\n \n | \r\n ^Spacer(53,1); | \r\n
| \r\n
Design by Plain Black | \r\n
\r\n
\r\n
\r\n
| \r\n\"> | \r\n\"> | \r\n
| Transaction description | \r\nPrice | \r\nStatus | \r\nError | \r\n
|---|---|---|---|
| Product | \nQuantity | \nPrice | \nEach | \n
|---|---|---|---|
| \n | Subtotal | \n||
| Shipping | \n|||
| Total | \n
| $ | \r\n ||||
| $ | \r\n
\r\n \r\n| \n | \n \n \n | \n
![](\"^Extras;styles/webgui6/img_hands.jpg\")
\n\n\n\nNOTE: You could have also done these steps using the block at the top of this page.\n\n\n\n\n You might want to create another account for yourself with Administrative privileges in case you can\'t log in with the Admin account for some reason.\n\n\n \nYou\'ll now notice little buttons and menus on all the pages in your site. These controls help you administer your site. The \"Add content\" menu lets you add new content to your pages as well as paste content from the clipboard. The \"Administrative functions\" menu let\'s you control users and groups as well as many other admin settings. The little toolbars help you manipulate the content in your pages.\n\n\n\n\nFor more information about how to administer WebGUI consider getting a copy of Ruling WebGUI. Plain Black also provides several Support Programs for WebGUI if you run into trouble.\n\n\n \nEnjoy your new WebGUI site!','x_WjMvFmilhX-jvZuIpinw','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,' To learn more about WebGUI and how you can best implement WebGUI in your organization, please see the choices below.\n\n','DC1etlIaBRQitXnchZKvUw','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,'This is the latest news from Plain Black and WebGUI pulled directly from the site every hour.','fK-HMSboA3uu0c1KYkYspA','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,'Tell a friend about WebGUI.','Szs5eev3OMssmnsyLRZmWA','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,'','pJd5TLAjfWMVXD6sCRLwUg','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'68sKwDgf9cGH58-NZcU4lg','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'_iHetEvMQUOoxS-T2CM0sQ','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'8Bb8gu-me2mhL3ljFyiWLg','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'2TqQc4OISddWCZmRY1_m8A','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'Swf6L8poXKc7hUaNPkBevw','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(0,NULL,'x3OFY6OJh_qsXkZfPwug4A','B1bNjWVtzSjsvGZh9lPz_A','PBtmpl0000000000000111',60,600),(1,NULL,'PBasset000000000000002','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,NULL,'Wmjn6I1fe9DKhiIR39YC0g','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000001','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000014','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000015','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000016','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000017','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000018','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000019','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000020','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000021','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000002','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000006','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000007','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000008','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000009','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000010','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000011','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000012','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'PBnav00000000000000013','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'f2bihDeMoI-Ojt2dutJNQA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'KZ2UytxNpbF-3Eg3RNvQQQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(0,NULL,'G0wlShbk_XruYVfbXqWq_w','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,NULL,'UE5_3bD7kWDLUN2B-iuNuA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,NULL,'RTsbVBEYnn3OPZWmXyIFhQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'AdminConsole','HCQF9FBLWK3Se06yGLoliw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Article','79BY6IHpAtE2yuQwROh9tg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'AttachmentBox','ZexTeuMQaZ1fh4FOpLNlYw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/LDAP/Account','_r8Y0WwiHLyVEFe5M0idYQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/LDAP/Create','Mkc1dJDw-lqExS5uy7QReA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/LDAP/Login','zyS1TsKDvBk7Y55_GlWgxA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/WebGUI/Account','CDzQSnxPMWCy2j5ZOxWbrw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/WebGUI/Create','RPo_G59wjPTGE1-IhiE44A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/WebGUI/Expired','Oq61G3_QSM5TzArFUzUBiA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/WebGUI/Login','jcIZMBAyEcmXktAVwPxgIw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Auth/WebGUI/Recovery','ThLKZPeKbRAVEYTkKAxeCg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Collaboration','8r4-zJ6g-qOecM1PsvADbQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Collaboration/Notification','ECq9dLm5vmh4t963yDx1og','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Collaboration/PostForm','PNGrWdYDhJZTv1-sAX6W1Q','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Collaboration/Search','guQGD9YiTn55PqOUTjCc0A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Collaboration/Thread','-MlWyWh12ibRM8gAzRy41g','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Commerce/CheckoutCanceled','VvgRRrE6UsmWi7y7hMCXbw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Commerce/ConfirmCheckout','j3yljeaT2y9fLkSHM5Zbow','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Commerce/SelectPaymentGateway','2jkEIs9YpL10dZsA3RH4sw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Commerce/TransactionError','5SdElAemaCKBfheDk7rz8A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Commerce/ViewPurchaseHistory','arabONid_vy2W6cALhELxA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'DataForm','sb7g8aCLMq-XigfBdmw2cg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'DataForm/List','BAoMajIxnoGlrxhDVgot9g','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'EventsCalendar','b26vQzyaqz0EBMWH_oPdrg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'EventsCalendar/Event','jCMdSbD6IA535I16Pcik7Q','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'FileAsset','-Kmb-MEV4ni9d0tn_BYGXA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Folder','ZWv7HLTQ4oERBIFJHBz1Ow','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'HttpProxy','RcOR25DbCizyAfNWvr-2ow','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'ImageAsset','59f_y-iE0k8dSMVIyX5SBg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'IndexedSearch','2DAYoiOdplxZCrEwmrVhwQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Layout','tJ_X5F3Dkaz8vO6CigbJrg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/AdminBar','Fh_KALcbkc8CkBR3I6dU0g','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/AdminToggle','WTPOJerammxgkIdCWnR9uw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/a_account','PttBzI13R8HXqQn40I4UFg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/EditableToggle','VdTZ8_2vlZwVVuv_I7DsWA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/File','BBoAtdsTo2AGPe4k9kfkxA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/GroupAdd','A-m4h7Q3LYt61G54zpEGqA','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/GroupDelete','Wquzj9XSpxL_gpGXkoU6tg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/H_homeLink','J1uh__tKV2BARcSeFE7MSg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/LoginToggle','7EfoKU41oB0ZU6NmVIud4A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/L_loginBox','n1xT2JUidbeqNMN2zyvHAQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/r_printable','mKI2EjkU9QH6dJKkx7VEvw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Macro/SubscriptionItem','HOleaBMUZT6B5qJmbcV5xg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'MessageBoard','L070eyyGhoWx5cSUeNRrow','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Navigation','c3jDvo_bK3jFqjIefgXjUw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Operation/MessageLog/Message','VnUEcXfsbwgB5rqslQ3n1A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Operation/MessageLog/View','6MrxI11jyXuB-UUrX69lXQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Operation/Profile/Edit','xxuM0xMjhIA3lFq99GY05Q','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Operation/Profile/View','kHlR8-nCFRrwlEV1uapu_Q','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Operation/RedeemSubscription','r4FQlrIkS1_MTuk-vVqRNg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Poll','EvgkCMpx4kUonmjhhZXRjg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Product','I2DQUdFVd9FtcSealp4cTQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'prompt','khkob2AmnIKAxKJeXHE3fQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'richEditor','h34TI6OYynW5Q_FYLbZiig','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Shortcut','i7emhSfswYNreLAwn1wBRw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'SQLReport','o9PZOa7fy9AZa8fKmhoPrQ','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'style','eLdzeSyvZfml-YVFfgUiaw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Survey','ffWKX2dW4t1eWgfNng605w','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Survey/Gradebook','QWS2acYOu3Y4uNsWvVChTg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Survey/Overview','lUjGdT_Hhi_EFhsYr1Ouyw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'Survey/Response','7Xhdnqu3qkDWHEnRgk6Uzw','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'SyndicatedContent','xPyASYtR44mpDk3ba4YyIg','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,'WSClient','S99spbsvn96tgRA0oVUl2A','PBtmpl0000000000000060','PBtmpl0000000000000111',60,3600),(1,NULL,'Rn5Ef8vMDQ0ebtaxS_-JXA','','',60,3600),(1,NULL,'60wqz7KzyCDCHVNaavhQUA','','',60,3600),(1,NULL,'fhevmqeVTLRCmI_z-NidQQ','','',60,3600); -insert into webguiVersion (webguiVersion,versionType,dateApplied) values ('6.6.3','initial install',unix_timestamp()); +insert into webguiVersion (webguiVersion,versionType,dateApplied) values ('6.6.4','initial install',unix_timestamp()); diff --git a/docs/upgrades/upgrade_6.6.3-6.6.4.pl b/docs/upgrades/upgrade_6.6.3-6.6.4.pl new file mode 100644 index 000000000..e69b5b713 --- /dev/null +++ b/docs/upgrades/upgrade_6.6.3-6.6.4.pl @@ -0,0 +1,26 @@ +#!/usr/bin/perl + +use lib "../../lib"; +use Getopt::Long; +use strict; +use WebGUI::Session; +use WebGUI::Grouping; + +my $configFile; +my $quiet; + +GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet +); + +WebGUI::Session::open("../..",$configFile); + +#-------------------------------------------- +print "\tMaking admins part of product managers.\n" unless ($quiet); +WebGUI::Grouping::addGroupsToGroups(['3'],['14']); + + +WebGUI::Session::close(); + + diff --git a/docs/upgrades/upgrade_6.6.3-6.6.4.sql b/docs/upgrades/upgrade_6.6.3-6.6.4.sql new file mode 100644 index 000000000..7f2afd6fc --- /dev/null +++ b/docs/upgrades/upgrade_6.6.3-6.6.4.sql @@ -0,0 +1,7 @@ +insert into webguiVersion values ('6.6.4','upgrade',unix_timestamp()); +delete from settings where name='proxiedClientAddress'; +update template set template='
\r\n \r\n'. WebGUI::International::get('Add new field','Asset'). '
' -hoverHelp=>WebGUI::International::get('make prototype description',"Asset"), - ); + ); + } } return $tabform; } @@ -1172,8 +1176,10 @@ If this evaluates to True, then the smaller extras/adminConsole/small/assets.gif sub getIcon { my $self = shift; my $small = shift; - return $session{config}{extrasURL}.'/adminConsole/small/assets.gif' if ($small); - return $session{config}{extrasURL}.'/adminConsole/assets.gif'; + my $definition = $self->definition; + my $icon = $definition->[0]{icon}; + return $session{config}{extrasURL}.'/adminConsole/small/'.$icon if ($small); + return $session{config}{extrasURL}.'/adminConsole/'.$icon; } #------------------------------------------------------------------- @@ -1503,7 +1509,9 @@ Returns the internationalization of the word "Asset". =cut sub getName { - return WebGUI::International::get("asset","Asset"); + my $self = shift; + my $definition = $self->definition; + return $definition->[0]{assetName}; } #------------------------------------------------------------------- @@ -2020,14 +2028,7 @@ sub paste { my $assetId = shift; my $pastedAsset = WebGUI::Asset->newByDynamicClass($assetId); if ($self->getId eq $pastedAsset->get("parentId") || $pastedAsset->setParent($self)) { - my $assetIds = WebGUI::SQL->buildArrayRef("select assetId from asset where lineage like ".quote($self->get("lineage").'%')." and (state='clipboard' or state='clipboard-limbo')"); - my $idList = quoteAndJoin($assetIds); - WebGUI::SQL->write("update asset set state='published', stateChangedBy=".quote($session{user}{userId}).", stateChanged=".time()." where assetId in (".$idList.")"); - my $cache = WebGUI::Cache->new; - foreach my $id (@{$assetIds}) { - # we do the purge directly cuz it's a lot faster than instanciating all these assets - $cache->deleteChunk(["asset",$id]); - } + $pastedAsset->publish; $pastedAsset->updateHistory("pasted to parent ".$self->getId); return 1; } diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 1963346b9..eb29c3bb4 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -38,12 +38,13 @@ use WebGUI::Asset::Wobject::EventsCalendar; our @ISA = qw(WebGUI::Asset); - #------------------------------------------------------------------- sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(511,"Asset_Event"), + icon=>'calendar.gif', tableName=>'EventsCalendar_event', className=>'WebGUI::Asset::Event', properties=>{ @@ -325,20 +326,6 @@ sub getEditForm { -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/calendar.gif' if ($small); - return $session{config}{extrasURL}.'/assets/calendar.gif'; -} - - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(511,"Asset_Event"); -} - #------------------------------------------------------------------- sub processPropertiesFromFormPost { @@ -381,6 +368,25 @@ sub processPropertiesFromFormPost { } +#------------------------------------------------------------------- + +=head setParent ( newParent ) + +We're overloading the setParent in Asset because we don't want events to be able to be posted to anything other than the events calendar. + +=head3 newParent + +An asset object to make the parent of this asset. + +=cut + +sub setParent { + my $self = shift; + my $newParent = shift; + return 0 unless ($newParent->get("className") eq "WebGUI::Asset::Wobject::EventsCalendar"); + return $self->SUPER::setParent($newParent); +} + #------------------------------------------------------------------- sub view { my $self = shift; diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index ea731cd31..a5c9f252e 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -60,6 +60,7 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('file',"Asset_File"), tableName=>'FileAsset', className=>'WebGUI::Asset::File', properties=>{ @@ -163,19 +164,6 @@ sub getIcon { } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get('file',"Asset_File"); -} - - #------------------------------------------------------------------- sub getStorageLocation { my $self = shift; @@ -212,7 +200,6 @@ sub processPropertiesFromFormPost { $data{url} = $self->getParent->get('url').'/'.$filename unless ($session{form}{url}); $self->update(\%data); $self->setSize($storage->getFileSize($filename)); - $storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit")); $self->{_storageLocation} = $storage; } else { $storage->delete; @@ -239,6 +226,27 @@ sub purge { } +#------------------------------------------------------------------- + +=head2 update + +We overload the update method from WebGUI::Asset in order to handle file system privileges. + +=cut + +sub update { + my $self = shift; + my %before = ( + owner => $self->get("ownerUserId"), + view => $self->get("groupIdView"), + edit => $self->get("groupIdEdit") + ); + $self->SUPER::update(@_); + if ($self->get("ownerUserId") ne $before{owner} || $self->get("groupIdEdit") ne $before{edit} || $self->get("groupIdView") ne $before{view}) { + $self->getStorageLocation->setPrivileges($self->get("ownerUserId"),$self->get("groupIdView"),$self->get("groupIdEdit")); + } +} + #------------------------------------------------------------------- sub view { my $self = shift; diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 70c421437..d3cebeb20 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -64,6 +64,7 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('image',"Asset_Image"), tableName=>'ImageAsset', className=>'WebGUI::Asset::File::Image', properties=>{ @@ -152,19 +153,6 @@ sub getIcon { } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get('image',"Asset_Image"); -} - - #------------------------------------------------------------------- sub getStorageLocation { my $self = shift; diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 61629a3e8..6df3aec30 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -93,6 +93,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('post',"Asset_Post") + icon=>'post.gif', tableName=>'Post', className=>'WebGUI::Asset::Post', properties=>{ @@ -256,13 +258,6 @@ sub getEditUrl { return $self->getUrl("func=edit"); } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/post.gif' if ($small); - return $session{config}{extrasURL}.'/assets/post.gif'; -} #------------------------------------------------------------------- sub getImageUrl { @@ -279,10 +274,6 @@ sub getImageUrl { return $url; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get('post',"Asset_Post"); -} #------------------------------------------------------------------- @@ -670,7 +661,6 @@ sub processPropertiesFromFormPost { $filename = $storage->addFileFromFormPost("file", $attachmentLimit) if $attachmentLimit; if (defined $filename) { $self->setSize($storage->getFileSize($filename)); - $storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit")); foreach my $file (@{$storage->getFiles}) { if ($storage->isImage($file)) { $storage->generateThumbnail($file,$session{setting}{maxImageSize}); @@ -740,6 +730,25 @@ sub setLastPost { } +#------------------------------------------------------------------- + +=head setParent ( newParent ) + +We're overloading the setParent in Asset because we don't want posts to be able to be posted to anything other than other posts or threads. + +=head3 newParent + +An asset object to make the parent of this asset. + +=cut + +sub setParent { + my $self = shift; + my $newParent = shift; + return 0 unless ($newParent->get("className") eq "WebGUI::Asset::Post" || $newParent->get("className") eq "WebGUI::Asset::Post::Thread"); + return $self->SUPER::setParent($newParent); +} + #------------------------------------------------------------------- =head2 setStatusApproved ( ) @@ -841,6 +850,27 @@ sub unmarkRead { WebGUI::SQL->write("delete from forumRead where userId=".quote($session{user}{userId})." and postId=".quote($self->getId)); } +#------------------------------------------------------------------- + +=head2 update + +We overload the update method from WebGUI::Asset in order to handle file system privileges. + +=cut + +sub update { + my $self = shift; + my %before = ( + owner => $self->get("ownerUserId"), + view => $self->get("groupIdView"), + edit => $self->get("groupIdEdit") + ); + $self->SUPER::update(@_); + if ($self->get("ownerUserId") ne $before{owner} || $self->get("groupIdEdit") ne $before{edit} || $self->get("groupIdView") ne $before{view}) { + $self->getStorageLocation->setPrivileges($self->get("ownerUserId"),$self->get("groupIdView"),$self->get("groupIdEdit")); + } +} + #------------------------------------------------------------------- sub view { my $self = shift; @@ -1021,7 +1051,7 @@ sub www_edit { richEditId=>$self->getThread->getParent->get("richEditor") }); $var{'form.submit'} = WebGUI::Form::submit({ - extras=>"onclick=\"this.value='".WebGUI::International::get(452)."'; this.form.func.value='editSave'; this.form.submit();\"" + extras=>"onclick=\"this.value='".WebGUI::International::get(452)."'; this.form.func.value='editSave'; this.form.submit();return false;\"" }); $var{'form.preview'} = WebGUI::Form::submit({ value=>WebGUI::International::get("preview","Asset_Collaboration") diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index 5f94bf615..203312890 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -72,6 +72,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('thread',"Asset_Thread"), + icon=>'thread.gif', tableName=>'Thread', className=>'WebGUI::Asset::Post::Thread', properties=>{ @@ -119,14 +121,6 @@ sub DESTROY { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/thread.gif' if ($small); - return $session{config}{extrasURL}.'/assets/thread.gif'; -} - #------------------------------------------------------------------- sub getLastPost { @@ -172,10 +166,6 @@ sub getLockUrl { $self->getUrl("func=lock"); } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get('thread',"Asset_Thread"); -} #------------------------------------------------------------------- @@ -470,6 +460,25 @@ sub rate { } +#------------------------------------------------------------------- + +=head setParent ( newParent ) + +We're overloading the setParent in Asset because we don't want threads to be able to be posted to anything other than other collaboration systems. + +=head3 newParent + +An asset object to make the parent of this asset. + +=cut + +sub setParent { + my $self = shift; + my $newParent = shift; + return 0 unless ($newParent->get("className") eq "WebGUI::Asset::Wobject::Collaboration"); + # specify the Asset package here directly because we don't want to use the ruls in WebGUI::Asset::Post, as they don't fit for Threads. + return $self->WebGUI::Asset::setParent($newParent); +} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index f7ed9452a..acb64cccd 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -60,6 +60,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('redirect',"Asset_Redirect"), + icon=>'redirect.gif', tableName=>'redirect', className=>'WebGUI::Asset::Redirect', properties=>{ @@ -95,13 +97,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/redirect.gif' if ($small); - return $session{config}{extrasURL}.'/assets/redirect.gif'; -} #------------------------------------------------------------------- @@ -116,18 +111,6 @@ sub getUiLevel { return 9; } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get('redirect',"Asset_Redirect"); -} - #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index 7ab0954b0..59d122103 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -62,6 +62,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>'Rich Editor', + icon=>'richEdit.gif', tableName=>'RichEdit', className=>'WebGUI::Asset::RichEdit', properties=>{ @@ -363,14 +365,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/adminConsole/small/richEdit.gif' if ($small); - return $session{config}{extrasURL}.'/adminConsole/richEdit.gif'; -} - #------------------------------------------------------------------- @@ -399,18 +393,6 @@ sub getUiLevel { return 5; } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return "Rich Editor"; -} - #------------------------------------------------------------------- sub getRichEditor { diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 75728bb22..91b78470b 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -25,6 +25,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(3,"Asset_Shortcut"), + icon=>'shortcut.gif', tableName=>'Shortcut', className=>'WebGUI::Asset::Shortcut', properties=>{ @@ -186,19 +188,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/shortcut.gif' if ($small); - return $session{config}{extrasURL}.'/assets/shortcut.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(3,"Asset_Shortcut"); -} - #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm index 780081358..c858f8631 100644 --- a/lib/WebGUI/Asset/Snippet.pm +++ b/lib/WebGUI/Asset/Snippet.pm @@ -61,6 +61,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('snippet',"Asset_Snippet"), + icon=>'snippet.gif', tableName=>'snippet', className=>'WebGUI::Asset::Snippet', properties=>{ @@ -123,14 +125,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/snippet.gif' if ($small); - return $session{config}{extrasURL}.'/assets/snippet.gif'; -} - #------------------------------------------------------------------- @@ -159,17 +153,6 @@ sub getUiLevel { return 5; } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get('snippet',"Asset_Snippet"); -} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm index 82bdfb07e..3534a9284 100644 --- a/lib/WebGUI/Asset/Template.pm +++ b/lib/WebGUI/Asset/Template.pm @@ -99,6 +99,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('template',"Asset_Template"), + icon=>'template.gif', tableName=>'template', className=>'WebGUI::Asset::Template', properties=>{ @@ -179,13 +181,6 @@ sub getEditForm { -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/template.gif' if ($small); - return $session{config}{extrasURL}.'/assets/template.gif'; -} #------------------------------------------------------------------- @@ -209,18 +204,6 @@ sub getList { } -#------------------------------------------------------------------- - -=head2 getName - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get('template',"Asset_Template"); -} - #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm index 2c7052425..f6c6828a4 100644 --- a/lib/WebGUI/Asset/Wobject.pm +++ b/lib/WebGUI/Asset/Wobject.pm @@ -72,27 +72,52 @@ sub definition { properties=>{ description=>{ fieldType=>'HTMLArea', - defaultValue=>undef + defaultValue=>undef, + tab=>"properties", + label=>WebGUI::International::get(85,'Wobject'), + hoverHelp=>WebGUI::International::get('85 description','Wobject') }, displayTitle=>{ fieldType=>'yesNo', - defaultValue=>1 + defaultValue=>1, + tab=>"display", + label=>WebGUI::International::get(174,'Wobject'), + hoverHelp=>WebGUI::International::get('174 description','Wobject'), + uiLevel=>5 }, cacheTimeout=>{ fieldType=>'interval', - defaultValue=>60 + defaultValue=>60, + tab=>"display", + label=>WebGUI::International::get(895,'Wobject'), + hoverHelp=>WebGUI::International::get('895 description','Wobject'), + uiLevel=>8 }, cacheTimeoutVisitor=>{ fieldType=>'interval', defaultValue=>600 + tab=>"display", + label=>WebGUI::International::get(896,'Wobject'), + hoverHelp=>WebGUI::International::get('896 description','Wobject'), + uiLevel=>8 }, styleTemplateId=>{ fieldType=>'template', - defaultValue=>undef + defaultValue=>undef, + tab=>"display", + label=>WebGUI::International::get(1073,'Wobject'), + hoverHelp=>WebGUI::International::get('1073 description','Wobject'), + namespace=>'style', + afterEdit=>'op=editPage&npp='.$session{form}{npp} }, printableStyleTemplateId=>{ fieldType=>'template', - defaultValue=>undef + defaultValue=>undef, + tab=>"display", + label=>WebGUI::International::get(1079,'Wobject'), + hoverHelp=>WebGUI::International::get('1079 description','Wobject'), + namespace=>'style', + afterEdit=>'op=editPage&npp='.$session{form}{npp} } } }); @@ -223,49 +248,18 @@ Returns the TabForm object that will be used in generating the edit page for thi sub getEditForm { my $self = shift; my $tabform = $self->SUPER::getEditForm(); - $tabform->getTab("display")->yesNo( - -name=>"displayTitle", - -label=>WebGUI::International::get(174,'Wobject'), - -hoverHelp=>WebGUI::International::get('174 description','Wobject'), - -value=>$self->getValue("displayTitle"), - -uiLevel=>5 - ); - $tabform->getTab("display")->template( - -name=>"styleTemplateId", - -label=>WebGUI::International::get(1073,'Wobject'), - -hoverHelp=>WebGUI::International::get('1073 description','Wobject'), - -value=>$self->getValue("styleTemplateId"), - -namespace=>'style', - -afterEdit=>'op=editPage&npp='.$session{form}{npp} - ); - $tabform->getTab("display")->template( - -name=>"printableStyleTemplateId", - -label=>WebGUI::International::get(1079,'Wobject'), - -hoverHelp=>WebGUI::International::get('1079 description','Wobject'), - -value=>$self->getValue("printableStyleTemplateId"), - -namespace=>'style', - -afterEdit=>'op=editPage&npp='.$session{form}{npp} - ); - $tabform->getTab("properties")->HTMLArea( - -name=>"description", - -label=>WebGUI::International::get(85,'Wobject'), - -hoverHelp=>WebGUI::International::get('85 description','Wobject'), - -value=>$self->getValue("description") - ); - $tabform->getTab("display")->interval( - -name=>"cacheTimeout", - -label=>WebGUI::International::get(895,'Wobject'), - -hoverHelp=>WebGUI::International::get('895 description','Wobject'), - -value=>$self->getValue("cacheTimeout"), - -uiLevel=>8 - ); - $tabform->getTab("display")->interval( - -name=>"cacheTimeoutVisitor", - -label=>WebGUI::International::get(896,'Wobject'), - -hoverHelp=>WebGUI::International::get('896 description','Wobject'), - -value=>$self->getValue("cacheTimeoutVisitor"), - -uiLevel=>8 - ); + my $definition = $self->definition; + my $properties = $definition->[0]{properties}; + foreach my $fieldname (keys %{$properties}) { + my %params; + foreach my $key (keys %{$properties->{$fieldname}}) { + next if ($key eq "tab" || $key eq "fieldType"); + $params{"-".$key} = $properties->{$fieldname}{$key} + } + $params{"-value"} = $self->getValue($fieldname); + $params{"-name"} = $fieldname; + $tabform->getTab($properties->{$fieldname}{tab})->dynamicField($properties->{$fieldname}{fieldType},%params); + } return $tabform; } diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm index 4e438bff2..2766136bd 100644 --- a/lib/WebGUI/Asset/Wobject/Article.pm +++ b/lib/WebGUI/Asset/Wobject/Article.pm @@ -26,24 +26,39 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,"Asset_Article"), + icon=>'article.gif', tableName=>'Article', className=>'WebGUI::Asset::Wobject::Article', properties=>{ templateId =>{ fieldType=>"template", - defaultValue=>'PBtmpl0000000000000002' + defaultValue=>'PBtmpl0000000000000002', + namespace=>"Article", + hoverHelp=>WebGUI::International::get('article template description','Asset_Article'), + label=>WebGUI::International::get(72,"Asset_Article") }, linkURL=>{ fieldType=>'url', - defaultValue=>undef + defaultValue=>undef, + label=>WebGUI::International::get(8,"Asset_Article"), + hoverHelp=>WebGUI::International::get('link url description','Asset_Article'), + uiLevel=>3 }, linkTitle=>{ fieldType=>'text', - defaultValue=>undef + defaultValue=>undef, + label=>WebGUI::International::get(7,"Asset_Article"), + hoverHelp=>WebGUI::International::get('link title description','Asset_Article'), + uiLevel=>3 }, convertCarriageReturns=>{ fieldType=>'yesNo', - defaultValue=>0 + defaultValue=>0, + label=>WebGUI::International::get(10,"Asset_Article"), + subtext=>' '.WebGUI::International::get(11,"Asset_Article").'', + hoverHelp=>WebGUI::International::get('carriage return description','Asset_Article'), + uiLevel=>5 } } }); @@ -52,51 +67,6 @@ sub definition { -#------------------------------------------------------------------- -sub getEditForm { - my $self = shift; - my $tabform = $self->SUPER::getEditForm(); - $tabform->getTab("display")->template( - -value=>$self->getValue('templateId'), - -namespace=>"Article", - -hoverHelp=>WebGUI::International::get('article template description','Asset_Article'), - -label=>WebGUI::International::get(72,"Asset_Article"), - ); - $tabform->getTab("properties")->text( - -name=>"linkTitle", - -label=>WebGUI::International::get(7,"Asset_Article"), - -value=>$self->getValue("linkTitle"), - -hoverHelp=>WebGUI::International::get('link title description','Asset_Article'), - -uiLevel=>3 - ); - $tabform->getTab("properties")->url( - -name=>"linkURL", - -label=>WebGUI::International::get(8,"Asset_Article"), - -value=>$self->getValue("linkURL"), - -hoverHelp=>WebGUI::International::get('link url description','Asset_Article'), - -uiLevel=>3 - ); - $tabform->getTab("display")->yesNo( - -name=>"convertCarriageReturns", - -label=>WebGUI::International::get(10,"Asset_Article"), - -value=>$self->getValue("convertCarriageReturns"), - -subtext=>' '.WebGUI::International::get(11,"Asset_Article").'', - -hoverHelp=>WebGUI::International::get('carriage return description','Asset_Article'), - -uiLevel=>5, - -defaultValue=>0 - ); - return $tabform; -} - - -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/article.gif' if ($small); - return $session{config}{extrasURL}.'/assets/article.gif'; -} - #------------------------------------------------------------------- sub getIndexerParams { my $self = shift; @@ -130,10 +100,6 @@ sub getIndexerParams { }; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,"Asset_Article"); -} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 9dd8829cd..abee28b6d 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -259,6 +259,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get('collaboration system',"Asset_collaboration"), + icon=>'collaboration.gif', tableName=>'Collaboration', className=>'WebGUI::Asset::Wobject::Collaboration', properties=>{ @@ -605,20 +607,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/collaboration.gif' if ($small); - return $session{config}{extrasURL}.'/assets/collaboration.gif'; -} - - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get('collaboration system',"Asset_collaboration"); -} - #------------------------------------------------------------------- @@ -775,10 +763,21 @@ sub isSubscribed { #------------------------------------------------------------------- sub processPropertiesFromFormPost { my $self = shift; + my $updatePrivs = ($session{form}{groupIdView} ne $self->get("groupIdView") || $session{form}{moderateGroupId} ne $self->get("moderateGroupId")); $self->SUPER::processPropertiesFromFormPost; if ($self->get("subscriptionGroupId") eq "") { $self->createSubscriptionGroup; } + if ($updatePrivs) { + foreach my $descendant (@{$self->getLineage(["descendants"],{returnObjects=>1})}) { + $descendant->update({ + groupIdView=>$self->get("groupIdView"), + groupIdEdit=>$self->get("moderateGroupId") + }); + } + } + WebGUI::Session::deleteScratch($self->getId."_sortBy"); + WebGUI::Session::deleteScratch($self->getId."_sortDir"); } @@ -869,9 +868,9 @@ sub view { my $scratchSortOrder = $self->getId."_sortDir"; my $sortBy = $session{form}{sortBy} || $session{scratch}{$scratchSortBy} || $self->get("sortBy"); my $sortOrder = $session{scratch}{$scratchSortOrder} || $self->get("sortOrder"); - if ($sortBy ne $session{scratch}{$scratchSortBy}) { + if ($sortBy ne $session{scratch}{$scratchSortBy} && $session{form}{func} ne "editSave") { WebGUI::Session::setScratch($scratchSortBy,$session{form}{sortBy}); - } elsif ($session{form}{sortBy}) { + } elsif ($session{form}{sortBy} && $session{form}{func} ne "editSave") { if ($sortOrder eq "asc") { $sortOrder = "desc"; } else { diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 855045274..14984d69c 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -135,7 +135,9 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,"Asset_DataForm"), tableName=>'DataForm', + icon=>'dataForm.gif', className=>'WebGUI::Asset::Wobject::DataForm', properties=>{ templateId =>{ @@ -270,13 +272,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/dataForm.gif' if ($small); - return $session{config}{extrasURL}.'/assets/dataForm.gif'; -} #------------------------------------------------------------------- sub getIndexerParams { @@ -542,10 +537,6 @@ sub getRecordTemplateVars { return $var; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,"Asset_DataForm"); -} #------------------------------------------------------------------- sub getUiLevel { diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm index 83594ad41..c58b99302 100644 --- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm @@ -38,11 +38,14 @@ our @ISA = qw(WebGUI::Asset::Wobject); # return WebGUI::Grouping::isInGroup($self->getValue("groupIdManage"),$userId); #} + #------------------------------------------------------------------- sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(2,"Asset_EventsCalendar"), + icon=>'calendar.gif', tableName=>'EventsCalendar', className=>'WebGUI::Asset::Wobject::EventsCalendar', properties=>{ @@ -180,19 +183,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/calendar.gif' if ($small); - return $session{config}{extrasURL}.'/assets/calendar.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(2,"Asset_EventsCalendar"); -} - #------------------------------------------------------------------- sub getUiLevel { diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index a6773638d..fcf0b393e 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -59,6 +59,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get("folder","Asset_Folder"), + icon=>'folder.gif', tableName=>'Folder', className=>'WebGUI::Asset::Wobject::Folder', properties=>{ @@ -103,27 +105,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/folder.gif' if ($small); - return $session{config}{extrasURL}.'/assets/folder.gif'; -} - -#------------------------------------------------------------------- - -=head2 getName () - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get("folder","Asset_Folder"); -} - - #------------------------------------------------------------------- =head2 getUiLevel () diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index d4e1151af..2b25e5817 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -33,6 +33,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(3,"Asset_HttpProxy"), + icon=>'httpProxy.gif', tableName=>'HttpProxy', className=>'WebGUI::Asset::Wobject::HttpProxy', properties=>{ @@ -164,19 +166,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/httpProxy.gif' if ($small); - return $session{config}{extrasURL}.'/assets/httpProxy.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(3,"Asset_HttpProxy"); -} - #------------------------------------------------------------------- sub getUiLevel { return 5; diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index c7d7c794b..0ac6421ed 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -59,6 +59,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get("layout","Asset_Layout"), + icon=>'layout.gif', tableName=>'Layout', className=>'WebGUI::Asset::Wobject::Layout', properties=>{ @@ -128,25 +130,6 @@ sub getEditForm { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/layout.gif' if ($small); - return $session{config}{extrasURL}.'/assets/layout.gif'; -} - -#------------------------------------------------------------------- - -=head2 getName () - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get("layout","Asset_Layout"); -} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm index e3e3fea2b..6e55cbae4 100644 --- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm @@ -26,45 +26,23 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(2,"Asset_MessageBoard"), + icon=>'messageBoard.gif', tableName=>'MessageBoard', className=>'WebGUI::Asset::Wobject::MessageBoard', properties=>{ templateId =>{ fieldType=>"template", - defaultValue=>'PBtmpl0000000000000047' + defaultValue=>'PBtmpl0000000000000047', + namespace=>"MessageBoard", + label=>WebGUI::International::get(73,"Asset_MessageBoard"), + hoverHelp=>WebGUI::International::get('73 description',"Asset_MessageBoard") }, } }); return $class->SUPER::definition($definition); } -#------------------------------------------------------------------- -sub getEditForm { - my $self = shift; - my $tabform = $self->SUPER::getEditForm(); - $tabform->getTab("display")->template( - -value=>$self->getValue('templateId'), - -namespace=>"MessageBoard", - -label=>WebGUI::International::get(73,"Asset_MessageBoard") - -hoverHelp=>WebGUI::International::get('73 description',"Asset_MessageBoard") - ); - return $tabform; -} - - -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/messageBoard.gif' if ($small); - return $session{config}{extrasURL}.'/assets/messageBoard.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(2,"Asset_MessageBoard"); -} - #------------------------------------------------------------------- sub view { diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index 21ffed256..3be3ff038 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -27,12 +27,13 @@ use WebGUI::Utility; our @ISA = qw(WebGUI::Asset::Wobject); - #------------------------------------------------------------------- sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get("navigation","Asset_Navigation"), + icon=>'navigation.gif', tableName=>'Navigation', className=>'WebGUI::Asset::Wobject::Navigation', properties=>{ @@ -257,18 +258,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/navigation.gif' if ($small); - return $session{config}{extrasURL}.'/assets/navigation.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get("navigation","Asset_Navigation"); -} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm index 748e9ccd1..7d14eed5d 100644 --- a/lib/WebGUI/Asset/Wobject/Poll.pm +++ b/lib/WebGUI/Asset/Wobject/Poll.pm @@ -38,7 +38,9 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,"Asset_Poll"), tableName=>'Poll', + icon=>'poll.gif', className=>'WebGUI::Asset::Wobject::Poll', properties=>{ templateId =>{ @@ -240,14 +242,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/poll.gif' if ($small); - return $session{config}{extrasURL}.'/assets/poll.gif'; -} - #------------------------------------------------------------------- sub getIndexerParams { my $self = shift; @@ -279,11 +273,6 @@ sub getIndexerParams { }; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,"Asset_Poll"); -} - #------------------------------------------------------------------- sub processPropertiesFromFormPost { diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm index e9415bbc1..6cdbda260 100644 --- a/lib/WebGUI/Asset/Wobject/Product.pm +++ b/lib/WebGUI/Asset/Wobject/Product.pm @@ -77,6 +77,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,"Asset_Product"), + icon=>'product.gif', tableName=>'Product', className=>'WebGUI::Asset::Wobject::Product', properties=>{ @@ -299,10 +301,6 @@ sub getIndexerParams { }; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,"Asset_Product"); -} #------------------------------------------------------------------- sub getThumbnailFilename { diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 37b685478..14f47ed4b 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -32,6 +32,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,"Asset_SQLReport"), + icon=>'sqlReport.gif', tableName=>'SQLReport', className=>'WebGUI::Asset::Wobject::SQLReport', properties=>{ @@ -231,19 +233,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/sqlReport.gif' if ($small); - return $session{config}{extrasURL}.'/assets/sqlReport.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,"Asset_SQLReport"); -} - #------------------------------------------------------------------- sub getUiLevel { diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index a15a2d69e..2a34102a8 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -55,6 +55,8 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(1,'Asset_Survey'), + icon=>'survey.gif', tableName => 'Survey', className => 'WebGUI::Asset::Wobject::Survey', properties => { @@ -286,13 +288,6 @@ sub getEditForm { return $tabform; } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/survey.gif' if ($small); - return $session{config}{extrasURL}.'/assets/survey.gif'; -} # # WID FIXEN! @@ -520,10 +515,6 @@ sub getUserId { return $userId; } -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1,'Asset_Survey'); -} #------------------------------------------------------------------- sub purge { diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index 9b93e37a3..64ae35386 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -73,60 +73,56 @@ sub definition { my $class = shift; my $definition = shift; push(@{$definition}, { + assetName=>WebGUI::International::get(2,'Asset_SyndicatedContent'), + icon=>'syndicatedContent.gif', tableName=>'SyndicatedContent', className=>'WebGUI::Asset::Wobject::SyndicatedContent', properties=>{ templateId =>{ fieldType=>'template', - defaultValue=>'PBtmpl0000000000000065' + defaultValue=>'PBtmpl0000000000000065', + namespace=>'SyndicatedContent', + label=>WebGUI::International::get(72,'Asset_SyndicatedContent'), + hoverHelp=>WebGUI::International::get('72 description','Asset_SyndicatedContent') }, rssUrl=>{ defaultValue=>undef, - fieldType=>'textarea' + fieldType=>'textarea', + label=>WebGUI::International::get(1,'Asset_SyndicatedContent'), + hoverHelp=>WebGUI::International::get('1 description','Asset_SyndicatedContent') }, maxHeadlines=>{ fieldType=>'integer', - defaultValue=>10 + defaultValue=>10, + label=>WebGUI::International::get(3,'Asset_SyndicatedContent'), + hoverHelp=>WebGUI::International::get('3 description','Asset_SyndicatedContent') }, displayMode=>{ - fieldType=>'text', - defaultValue=>'interleaved' - }, + fieldType=>'selectList', + defaultValue=>'interleaved', + options=>{ + 'interleaved'=>WebGUI::International::get('interleaved','Asset_SyndicatedContent'), + 'grouped'=>WebGUI::International::get('grouped','Asset_SyndicatedContent'), + }, + sortByValue=>1, + label=>WebGUI::International::get('displayModeLabel','Asset_SyndicatedContent'), + hoverHelp=>WebGUI::International::get('displayModeLabel description','Asset_SyndicatedContent'), + subtext=>WebGUI::International::get('displayModeSubtext','Asset_SyndicatedContent') + }, hasTerms=>{ - fieldType=>'text', - defaultValue=>'' - } + fieldType=>'text', + defaultValue=>'', + label=>WebGUI::International::get('hasTermsLabel','Asset_SyndicatedContent'), + hoverHelp=>WebGUI::International::get('hasTermsLabel description','Asset_SyndicatedContent'), + maxlength=>255 + } } }); return $class->SUPER::definition($definition); } -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -=head2 getName () -Returns the icons associated with this asset. - -=cut - -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/syndicatedContent.gif' if ($small); - return $session{config}{extrasURL}.'/assets/syndicatedContent.gif'; -} - - -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -=head2 getName () - -Returns the displayable name of this asset. - -=cut - -sub getName { - return WebGUI::International::get(2,'Asset_SyndicatedContent'); -} #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -141,59 +137,6 @@ sub getUiLevel { } -#------------------------------------------------------------------- -=head2 getEditForm () - -Returns the TabForm object that will be used in generating the edit page for this asset. - -=cut - -sub getEditForm { - my $self = shift; - my $tabform = $self->SUPER::getEditForm(); - $tabform->getTab('display')->template( - -value=>$self->getValue('templateId'), - -namespace=>'SyndicatedContent', - -label=>WebGUI::International::get(72,'Asset_SyndicatedContent'), - -hoverHelp=>WebGUI::International::get('72 description','Asset_SyndicatedContent'), - ); - $tabform->getTab('display')->selectList( - -name=>'displayMode', - -options=>{ - 'interleaved'=>WebGUI::International::get('interleaved','Asset_SyndicatedContent'), - 'grouped'=>WebGUI::International::get('grouped','Asset_SyndicatedContent'), - }, - -sortByValue=>1, - -label=>WebGUI::International::get('displayModeLabel','Asset_SyndicatedContent'), - -hoverHelp=>WebGUI::International::get('displayModeLabel description','Asset_SyndicatedContent'), - -value=>[$self->getValue('displayMode')], - -subtext=>WebGUI::International::get('displayModeSubtext','Asset_SyndicatedContent'), - ); - $tabform->getTab('display')->text( - -name=>'hasTerms', - -label=>WebGUI::International::get('hasTermsLabel','Asset_SyndicatedContent'), - -hoverHelp=>WebGUI::International::get('hasTermsLabel description','Asset_SyndicatedContent'), - -maxlength=>255, - -value=>$self->getValue('hasTerms'), - ); - $tabform->getTab('properties')->textarea( - -name=>'rssUrl', - -label=>WebGUI::International::get(1,'Asset_SyndicatedContent'), - -hoverHelp=>WebGUI::International::get('1 description','Asset_SyndicatedContent'), - -value=>$self->getValue('rssUrl') - ); - - $tabform->getTab('display')->integer( - -name=>'maxHeadlines', - -label=>WebGUI::International::get(3,'Asset_SyndicatedContent'), - -hoverHelp=>WebGUI::International::get('3 description','Asset_SyndicatedContent'), - -value=>$self->getValue('maxHeadlines') - ); - #$tabform->addTab('rss',WebGUI::International::get('rssTabName','Asset_SyndicatedContent')); - - return $tabform; -} - #------------------------------------------------------------------- # strip all html tags from the given data structure. This is important to # prevent cross site scripting attacks diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm index c91ffb3cf..2ed80dee4 100644 --- a/lib/WebGUI/Asset/Wobject/WSClient.pm +++ b/lib/WebGUI/Asset/Wobject/WSClient.pm @@ -55,17 +55,18 @@ sub _create_cache_key { return $cache_key; } + #------------------------------------------------------------------- sub definition { my $class = shift; my $definition = shift; - my $httpHeaderFieldType; - if ($session{'config'}{'soapHttpHeaderOverride'}) { $httpHeaderFieldType = 'text'; } else { $httpHeaderFieldType = 'hidden'; } push(@{$definition}, { + assetName=>WebGUI::International::get(1, "Asset_WSClient"), + icon=>'web_services.gif', tableName=>'WSClient', className=>'WebGUI::Asset::Wobject::WSClient', properties=>{ @@ -130,19 +131,6 @@ sub definition { } -#------------------------------------------------------------------- -sub getIcon { - my $self = shift; - my $small = shift; - return $session{config}{extrasURL}.'/assets/small/web_services.gif' if ($small); - return $session{config}{extrasURL}.'/assets/web_services.gif'; -} - -#------------------------------------------------------------------- -sub getName { - return WebGUI::International::get(1, "Asset_WSClient"); -} - #------------------------------------------------------------------- sub getUiLevel { return 9; diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 414fd9166..c8d779770 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -381,7 +381,7 @@ sub displayLogin { my $method = $_[0] || "login"; my $vars = $_[1]; unless ($session{form}{op} eq "auth") { - WebGUI::Session::setScratch("redirectAfterLogin",$session{env}{REQUEST_URI}); + WebGUI::Session::setScratch("redirectAfterLogin",WebGUI::URL::getSiteURL().WebGUI::URL::getScriptURL().$session{env}{PATH_INFO}."?".$session{env}{QUERY_STRING}); } $vars->{title} = WebGUI::International::get(66); my $action; diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index 34d34610f..f1561704b 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -326,11 +326,6 @@ our $HELP = { description => '535 description', namespace => 'WebGUI', }, - { - title => '973', - description => '973 description', - namespace => 'WebGUI', - }, { title => '400', description => '400 description', diff --git a/lib/WebGUI/Mail.pm b/lib/WebGUI/Mail.pm index 7ce83cfa1..01bf22a08 100644 --- a/lib/WebGUI/Mail.pm +++ b/lib/WebGUI/Mail.pm @@ -86,10 +86,11 @@ sub send { } $from = $_[4] || $session{setting}{companyEmail}; #header - $message = "To: $_[0]\n"; + my $to = $session{config}{emailOverride} || $_[0]; + $message = "To: $to\n"; $message .= "From: $from\n"; - $message .= "CC: $_[3]\n" if ($_[3]); - $message .= "BCC: $_[5]\n" if ($_[5]); + $message .= "CC: $_[3]\n" if ($_[3] && !$session{config}{emailOverride}); + $message .= "BCC: $_[5]\n" if ($_[5] && !$session{config}{emailOverride}); $message .= "Subject: ".$_[1]."\n"; $message .= "Date: ".WebGUI::DateTime::epochToHuman("","%W, %d %C %y %j:%n:%s %O")."\n"; if (($_[2] =~ m//i) || ($_[2] =~ m/'; @@ -211,7 +203,7 @@ sub www_deleteGroup { #------------------------------------------------------------------- sub www_deleteGroupConfirm { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); return WebGUI::Privilege::vitalComponent() if (isIn($session{form}{gid}, qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17))); my $g = WebGUI::Group->new($session{form}{gid}); $g->delete; @@ -220,14 +212,14 @@ sub www_deleteGroupConfirm { #------------------------------------------------------------------- sub www_deleteGroupGrouping { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup('3')); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup('3') || _hasSecondaryPrivilege($session{form}{gid})); WebGUI::Grouping::deleteGroupsFromGroups([$session{form}{delete}],[$session{form}{gid}]); return www_manageGroupsInGroup(); } #------------------------------------------------------------------- sub www_deleteGrouping { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') { return WebGUI::Privilege::vitalComponent(); } @@ -240,19 +232,10 @@ sub www_deleteGrouping { return WebGUI::Operation::Group::www_manageUsersInGroup(); } -#------------------------------------------------------------------- -sub www_deleteGroupingSecondary { - return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid}); - if ($session{user}{userId} eq $session{form}{uid}) { - return WebGUI::Privilege::vitalComponent(); - } - WebGUI::Grouping::deleteUsersFromGroups([$session{form}{uid}],[$session{form}{gid}]); - return www_manageUsersInGroupSecondary(); -} #------------------------------------------------------------------- sub www_editGroup { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); my ($output, $f, $g); if ($session{form}{gid} eq "new") { $g = WebGUI::Group->new(""); @@ -392,7 +375,7 @@ sub www_editGroup { #------------------------------------------------------------------- sub www_editGroupSave { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); my $g = WebGUI::Group->new($session{form}{gid}); $g->description($session{form}{description}); $g->name($session{form}{groupName}); @@ -417,7 +400,7 @@ sub www_editGroupSave { #------------------------------------------------------------------- sub www_editGrouping { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); my $f = WebGUI::HTMLForm->new; $f->hidden("op","editGroupingSave"); $f->hidden("uid",$session{form}{uid}); @@ -438,7 +421,7 @@ sub www_editGrouping { #------------------------------------------------------------------- sub www_editGroupingSave { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); WebGUI::Grouping::userGroupExpireDate($session{form}{uid},$session{form}{gid},setToEpoch($session{form}{expireDate})); WebGUI::Grouping::userGroupAdmin($session{form}{uid},$session{form}{gid},$session{form}{groupAdmin}); return www_manageUsersInGroup(); @@ -446,7 +429,7 @@ sub www_editGroupingSave { #------------------------------------------------------------------- sub www_emailGroup { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); my ($output,$f); $f = WebGUI::HTMLForm->new; $f->hidden("op","emailGroupSend"); @@ -472,7 +455,7 @@ sub www_emailGroup { #------------------------------------------------------------------- sub www_emailGroupSend { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); + return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); my ($sth, $email); $sth = WebGUI::SQL->read("select b.fieldData from groupings a left join userProfileData b on a.userId=b.userId and b.fieldName='email' where a.groupId=".quote($session{form}{gid})); @@ -487,65 +470,63 @@ sub www_emailGroupSend { #------------------------------------------------------------------- sub www_listGroups { - return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3)); - my $output = getGroupSearchForm("listGroups"); - my ($groupCount) = WebGUI::SQL->quickArray("select count(*) from groups"); - return _submenu($output) unless ($session{form}{doit} || $groupCount<250 || $session{form}{pn} > 1); - $output .= '
| '.WebGUI::International::get(84).' | ' - .WebGUI::International::get(85).' | ' - .WebGUI::International::get(748).' |
| {groupId}).'">'.$row->{groupName}.' | -'.$row->{description}.' | -'.$userCount.' | -
| '.WebGUI::International::get(84).' | ' + .WebGUI::International::get(85).' | ' + .WebGUI::International::get(748).' |
| {groupId}).'">'.$row->{groupName}.' | +'.$row->{description}.' | +'.$userCount.' | +
| '.WebGUI::International::get(84).' | ' + .WebGUI::International::get(85).' | ' + .WebGUI::International::get(748).' |
| '.WebGUI::International::get(84).' | ' - .WebGUI::International::get(85).' | ' - .WebGUI::International::get(748).' |
| - | '.WebGUI::International::get(50).' | -'.WebGUI::International::get(369).' |
| ' - .deleteIcon('op=deleteGroupingSecondary&uid='.$hash{userId}.'&gid='.$session{form}{gid}) - .' | '; - $output .= '' - .$hash{username}.' | '; - $output .= ''.epochToHuman($hash{expireDate},"%z").' |