',0,NULL,NULL),('\n\n\n','EMS/SubmissionQueue',1,1,'ktSvKU8riGimhcsxXwqvPQ',1279073450,'WebGUI::Asset::Template::HTMLTemplate',1,'',0,NULL,NULL),('\n\n\n
\n ^International(compare button label,Asset_Matrix);
\n
\n \n
\n
\n
^International(\'compare button label\',\'Asset_Matrix\');
^International(\'search label\',\'Asset_Matrix\');
What\'s that you say? WebGUI\'s thousands of features are still missing some important ones? No problem, our professional development team can add any features you need for your site. We\'ve built hundreds of custom apps for people. From simple macros, to custom single sign on systems, to applications that will manage your entire company, our team can do it.
','4Yfz9hqBqM8OYMGuQK8oLw','stevestyle000000000003','stevestyle000000000003',1147642516,'stevestyle000000000003'),(0,'\n\nNow you should log in and go into admin mode . The default username is \"admin\" and the default password is \"123qwe\", but you probably customized both of those when you visited this site for the very first time.\n
\n\nNow that you\'re logged in, we recommend that you add a new user for yourself with admin privileges just in case you forget the login information for your primary admin account. Don\'t worry if you lock yourself out, you can always contact Plain Black® support to get instructions to get back in.\n
NOTE: If you appear to be get logged out while moving between pages, this is most likely your browser displaying a cached version of the page. Click on your browser\'s refresh button to correct the problem.
\n\nNo doubt after you enabled admin mode you saw a menu along the left side of the screen, that\'s called the Admin Bar. Use that to add content and access administrative functions. You\'re now ready to begin exploring your new WebGUI site.
\n\nFor more information about services related to WebGUI click here .\n
\n\nEnjoy your new WebGUI site!\n
\n','NK8bqlwVRILJknqeCDPBHg','stevestyle000000000003','stevestyle000000000003',1147642515,'stevestyle000000000003'),(1,'Plain Black® created the WebGUI Content Engine® and is here to answer your questions and provide you with services to make sure your WebGUI implementation is entirely successful. We bend over backwards to make sure you\'re a success. Contact us today to see how we can help you.
','6QuS-0rosuZTdTv11fobig','stevestyle000000000003','stevestyle000000000003',1147642515,'stevestyle000000000003'),(1,'Plain Black provides support packages to fit any budget or need. Start out with online support which costs only $500 per year! And grow support as your needs grow. We build custom support packages to match our client\'s needs. And no matter what level of support you purchase, you get WebGUI Documentation included in your purchase.
','ix1p0AbwKAz8QWB-T-HHfg','stevestyle000000000003','stevestyle000000000003',1147642516,'stevestyle000000000003'),(1,'\n\nEasy To Use - WebGUI is absolutely easy to use. WebGUI 7 has a completely revamped user interface to make it even easier to use. There are lots of visual cues, consistent icons, helper apps, and a huge repository of built-in help files.\n
\n\nWorkflow & Versioning - Never again worry about content getting put on your site that you don\'t want there. Never again lose your old content after making an edit. And never again push out new changes until you\'re absolutely ready to release them. WebGUI\'s workflow and versioning system is fast, flexible, powerful, and easy to use.\n
\n\nEverything\'s a Template - Worry nevermore about your CMS forcing you into a mould that doesn\'t suit you. With WebGUI everything a site visitor can see is a customizable template, so you can make it look exactly how you want. Moreover if you\'re the type that strives for excellence rest in the knowledge that all the templates that come with WebGUI are XHTML 1.0 strict compliant.\n
\n\nLocalization - WebGUI\'s entire user interface is set up to be internationalized. Visit one of the WebGUI Worldwide member sites to get translations for your language. Stay there to get support and services in your native language. Feel confident in the knowledge that WebGUI will work with your native characters because it\'s UTF-8 compliant. On top of that WebGUI allows you to customize dates, currency, and weights to match your locale. \n
\n\nPluggable By Design - With WebGUI 7 you have many plug-in points to add your own functionality. And best of all, the API is stable and standardized. Write it today and it will still work years from now and survive all upgrades.\n
\n','IWFxZDyGhQ3-SLZhELa3qw','stevestyle000000000003','stevestyle000000000003',1147642514,'stevestyle000000000003'),(1,'The WebGUI Content Engine® is a powerful and easy to use system for managing web sites, and building web applications. It provides thousands of features out of the box, and lots of plug-in points so you can extend it to match your needs. It\'s easy enough for the average business user, but powerful enough for any large enterprise.
\n\nThere are thousands of small and large businesses, schools , universities , governments , associations , clubs , churches , projects , and communities using WebGUI all over the world today. A brief list of some of them can be found here . Your site should be on that list.
\n\nIf you\'re new to WebGUI, click here to learn how to get started . If you\'re getting up to speed, check out some ways you can do more faster . If this is all old hat to you, then check out the latest news . No matter what level you\'re at tell your friends about WebGUI.
','OhdaFLE7sXOzo_SIP2ZUgA','stevestyle000000000003','stevestyle000000000003',1147642513,'stevestyle000000000003'),(0,'This is the latest news from Plain Black and WebGUI pulled directly from the site every hour.','fK-HMSboA3uu0c1KYkYspA','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'pJd5TLAjfWMVXD6sCRLwUg','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'68sKwDgf9cGH58-NZcU4lg','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'_iHetEvMQUOoxS-T2CM0sQ','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'8Bb8gu-me2mhL3ljFyiWLg','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'2TqQc4OISddWCZmRY1_m8A','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'Swf6L8poXKc7hUaNPkBevw','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(0,NULL,'x3OFY6OJh_qsXkZfPwug4A','stevestyle000000000003','PBtmpl0000000000000111',1124395696,'stevestyle000000000003'),(1,NULL,'PBasset000000000000002','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'7-0-style0000000000026','PBtmpl0000000000000060','',1147642499,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000001','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000014','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000015','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000016','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000017','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000018','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000019','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000020','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000021','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000002','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000006','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000007','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000008','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000009','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000010','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000011','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000012','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'PBnav00000000000000013','PBtmpl0000000000000060','PBtmpl0000000000000111',1124395696,'PBtmpl0000000000000060'),(0,NULL,'7-0-style0000000000070','PBtmpl0000000000000060','PBtmpl0000000000000060',1147642510,'PBtmpl0000000000000060'),(1,'Let our team of professional translators bring your site to new customers by translating your content into additional languages. Our translation services are never machine automated. They\'re always done by professional translators that have years of experience reading, writing, and speaking many languages.
','LBuiKzg2mWwmOPS9AgV3bg','stevestyle000000000003','stevestyle000000000003',1147642517,'stevestyle000000000003'),(1,'Now that you have a brilliant WebGUI site, you need to get people to visit it. We can help there too. Our marketing specialists can work with you to develop and execute the right combination of search engine placement, advertising buys, and affilliate programs to ensure your site gets the traffic it needs .
','jTNggl7AoVSUc_ZzrvuCmw','stevestyle000000000003','stevestyle000000000003',1147642517,'stevestyle000000000003'),(1,NULL,'7-0-style0000000000001','PBtmpl0000000000000060','',1147642492,'PBtmpl0000000000000060'),(1,'\n\nIf you\'re reading this message that means you\'ve successfully installed and configured the WebGUI Content Engine®. Great job! To get started with managing content, watch the short instructional video below.\n
\nNOTE: Click on the green start icon on the video to begin your tutorial.
','bX5rYxb6tZ9docY6sUhBlw','stevestyle000000000003','stevestyle000000000003',1147642514,'stevestyle000000000003'),(1,NULL,'7-0-style0000000000031','PBtmpl0000000000000060','',1147642500,'PBtmpl0000000000000060'),(0,NULL,'7-0-style0000000000025','PBtmpl0000000000000060','',1147642498,'PBtmpl0000000000000060'),(1,NULL,'PBasset000000000000003','PBtmpl0000000000000060','PBtmpl0000000000000111',1147642437,'PBtmpl0000000000000060'),(1,NULL,'nbSrhXZQuxIjhWFaFPSuVA','PBtmpl0000000000000060','',1147642465,'PBtmpl0000000000000060'),(1,NULL,'S1A9iAwKcQQ6P20uTqw-Ew','PBtmpl0000000000000060','',1147642468,'PBtmpl0000000000000060'),(1,'Not a designer? No problem! Plain Black\'s professional design team can make your site look great. Our team is fast, easy to work with, and can even migrate your existing content into your new WebGUI site.
','Wl8WZ43g2rK5AYr9o4zY7w','stevestyle000000000003','stevestyle000000000003',1247779880,'stevestyle000000000003'),(1,NULL,'N13SD1Fpqk00UgBt1Z8ivQ','PBtmpl0000000000000060','',1147642470,'PBtmpl0000000000000060'),(1,NULL,'-WM2dt0ZGpDasuL2wWocxg','PBtmpl0000000000000060','PBtmpl0000000000000111',1222803056,'PBtmpl0000000000000060'),(1,NULL,'3uuBf8cYuj1sew2OJXl9tg','PBtmpl0000000000000060','',1147642470,'PBtmpl0000000000000060'),(1,NULL,'cj2y4papTVGZRFdwTI-_fw','PBtmpl0000000000000060','',1147642475,'PBtmpl0000000000000060'),(1,NULL,'bBzO4CWjqU_ile3gf5Iypw','PBtmpl0000000000000060','',1147642475,'PBtmpl0000000000000060'),(1,NULL,'Da6KWn805L4B5e4HFgQRQA','PBtmpl0000000000000060','',1147642479,'PBtmpl0000000000000060'),(0,'Tell a friend about WebGUI.','Szs5eev3OMssmnsyLRZmWA','stevestyle000000000003','PBtmpl0000000000000111',1213317790,'stevestyle000000000003'),(1,NULL,'bbiA9Zq5Gy2oCFBlILO3QA','PBtmpl0000000000000060','',1147642480,'PBtmpl0000000000000060'),(1,NULL,'Efe2W0UgrSRDltNJ87jlfg','PBtmpl0000000000000060','',1147642480,'PBtmpl0000000000000060'),(1,NULL,'9wKWdum0_8z-OhhquWLtSQ','PBtmpl0000000000000060','',1147642483,'PBtmpl0000000000000060'),(1,NULL,'CSN-ZON7Uwv8kxf3F1fh5Q','PBtmpl0000000000000060','',1147642484,'PBtmpl0000000000000060'),(1,NULL,'TCtybxdqmdwdvRn555zpCQ','PBtmpl0000000000000060','',1147642484,'PBtmpl0000000000000060'),(1,NULL,'pbproto000000000000002','PBtmpl0000000000000060','',1163019036,'PBtmpl0000000000000060'),(1,NULL,'tempspace0000000000000','PBtmpl0000000000000060','PBtmpl0000000000000060',1185754574,'PBtmpl0000000000000060'),(1,NULL,'Tsg7xmPYv782j6IVz7yHFg','PBtmpl0000000000000060','PBtmpl0000000000000111',1213244777,'PBtmpl0000000000000060'),(1,'WebGUI Documentation is the ultimate compendium to WebGUI. This is a must for anyone working in WebGUI, and Plain Black offers vast bulk discounts so you can give it to everyone in your organization.
','FOvmwGC0GtZo5VTxJIL3OA','stevestyle000000000003','stevestyle000000000003',1247779862,'stevestyle000000000003'),(1,NULL,'TYo2Bwl7aafzTtdHlS-arQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1211664878,'PBtmpl0000000000000060'),(1,NULL,'6tK47xsaIH-ELw0IBo0uRQ','PBtmpl0000000000000060','PBtmpl0000000000000111',1210777115,'PBtmpl0000000000000060'),(1,NULL,'gbnRhcWNk1iQe32LFEB5eQ','PBtmpl0000000000000060','PBtmpl0000000000000111',1212086102,'PBtmpl0000000000000060'),(1,NULL,'6D4Z-oruXPS6OlH_Kx8pBg','PBtmpl0000000000000060','PBtmpl0000000000000111',1209509389,'PBtmpl0000000000000060'),(1,NULL,'C5fPz-Wg85vkYRvCdl-Xqw','PBtmpl0000000000000060','PBtmpl0000000000000111',1212160830,'PBtmpl0000000000000060'),(1,'There are hundreds of pages of free documentation available for WebGUI, provided by both Plain Black and the community at large. The following list is by no means comprehensive, but it should get you started in the right direction.
\n\n
\n\nPrimer - A downloadable PDF that shows you the basics of publishing content in WebGUI.Wiki - Hundreds of pages of WebGUI community contributed content featuring a variety of tutorials.Worldwide - A collection of WebGUI related web sites from all over the world that have documentation and other resources for WebGUI.API Docs - The documentation of all of the WebGUI source code.Template Help - The documentation of all of WebGUI\'s template variables. \n
','j_1qEqM6iLfQLiR6VKy0aA','stevestyle000000000003','PBtmpl0000000000000111',1215718151,'stevestyle000000000003'),(1,'Plain Black has created a whole line of commercial books which total over 1500 pages of detailed documentation about WebGUI. Both black and white and full color editions of these books are available, and they are updated frequently to keep you on top of the latest WebGUI features. Visit the book store today to stock your WebGUI library. Other than hands on training , there is no better way to hone your WebGUI skills. No matter what your need, Plain Black has created a book that\'s right for you and is creating new books each year.
','diZvW4bSgZWwyyGP3qXi1g','stevestyle000000000003','PBtmpl0000000000000111',1215717972,'stevestyle000000000003'),(1,NULL,'jnYdqDkUR8x7Pv2eGR1qTA','PBtmpl0000000000000060','PBtmpl0000000000000111',1216250666,'PBtmpl0000000000000060'),(1,'With any large system, having the right documentation to get you started is mandatory. The good news is that WebGUI has abundant documentation.
','mTOiwwk3q4k9g5-XykXhPA','stevestyle000000000003','PBtmpl0000000000000111',1218149728,'stevestyle000000000003'),(1,NULL,'2OcUWHVsu_L1sDFzIMWYqw','PBtmpl0000000000000060','PBtmpl0000000000000111',1222803070,'PBtmpl0000000000000060'),(1,NULL,'zyWi26q9na-iiZqL4yedog','PBtmpl0000000000000060','PBtmpl0000000000000111',1222803114,'PBtmpl0000000000000060'),(1,NULL,'tBL7BWiQRZFed2Y-Zjo9tQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803200,'PBtmpl0000000000000060'),(1,NULL,'GdkQpvjRtJqtzOUbwIIQRA','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803205,'PBtmpl0000000000000060'),(1,NULL,'tnc5iYyynX2hfdEs9D3P8w','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803213,'PBtmpl0000000000000060'),(1,NULL,'vgXdBcFTqU7h4wBG1ewdBw','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803217,'PBtmpl0000000000000060'),(1,NULL,'hcFlqnXlsmC1ujN6Id0F0A','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803234,'PBtmpl0000000000000060'),(1,NULL,'eRJR52fvlaxfetv3DQkQYw','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803238,'PBtmpl0000000000000060'),(1,NULL,'5HIDHq5lAWHV5gpYGS0zLg','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803244,'PBtmpl0000000000000060'),(1,NULL,'rYEFwXXo0tkGhQTcbDibvg','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803249,'PBtmpl0000000000000060'),(1,NULL,'V3l5S5TtI7wMm1WpIMhvOA','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803253,'PBtmpl0000000000000060'),(1,NULL,'nqNbSUAhk9Vd1zda2SCz9A','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803258,'PBtmpl0000000000000060'),(1,NULL,'y8XkRdxIperLKkJ3bL5sSQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803264,'PBtmpl0000000000000060'),(1,NULL,'vTymIDYL2YqEh6PV50F7ew','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803302,'PBtmpl0000000000000060'),(1,NULL,'lo1ac3BsoJx3ijGQ3gR-bQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803309,'PBtmpl0000000000000060'),(1,NULL,'huASapWvFDzqwOSbcN-JFQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803313,'PBtmpl0000000000000060'),(1,NULL,'9A-mg2gwWmaYi9o_1C7ArQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803338,'PBtmpl0000000000000060'),(1,NULL,'yD1SMHelczihzjEmx6eXBA','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803342,'PBtmpl0000000000000060'),(1,NULL,'pV7GnZdpjR3XpZaSINIoeg','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803347,'PBtmpl0000000000000060'),(1,NULL,'71e17KeduiXgODLMlUxiow','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803352,'PBtmpl0000000000000060'),(1,NULL,'Ik9HHky10DIyFTKehUD1dw','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803478,'PBtmpl0000000000000060'),(1,NULL,'NywJYmGWe1f6EBXJnWg9Xg','PBtmpl0000000000000060','PBtmpl0000000000000111',1222803638,'PBtmpl0000000000000060'),(1,NULL,'AgyFhx3eXlfZXNp2MkrsiQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803665,'PBtmpl0000000000000060'),(1,NULL,'F7MAQ-cpuvQ1KuC7J4P5zQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803673,'PBtmpl0000000000000060'),(1,NULL,'BmLaN4rmAANkCglXUViEbg','PBtmpl0000000000000060','PBtmpl0000000000000060',1222803871,'PBtmpl0000000000000060'),(1,NULL,'X7DrzUcj8pOKFa_6k9D5iw','PBtmpl0000000000000060','PBtmpl0000000000000060',1222804045,'PBtmpl0000000000000060'),(1,NULL,'UL-ItI4L1Z6-WSuhuXVvsQ','stevestyle000000000003','PBtmpl0000000000000111',1225139673,'stevestyle000000000003'),(1,NULL,'7-0-style0000000000049','PBtmpl0000000000000060','PBtmpl0000000000000060',1224117144,'PBtmpl0000000000000060'),(0,NULL,'jVKLVakT_iA2010_oEuAwg','PBtmpl0000000000000060','PBtmpl0000000000000060',1224116526,'PBtmpl0000000000000060'),(1,'
','QpmlAiYZz6VsKBM-_0wXaw','stevestyle000000000003','PBtmpl0000000000000111',1224616691,'stevestyle000000000003'),(1,NULL,'HPDOcsj4gBme8D4svHodBw','PBtmpl0000000000000060','PBtmpl0000000000000111',1225404573,'PBtmpl0000000000000060'),(1,NULL,'IZkrow_zwvbf4FCH-taVTQ','PBtmpl0000000000000060','PBtmpl0000000000000111',1226011853,'PBtmpl0000000000000060'),(1,NULL,'K0YjxqOqr7RupSo6sIdcAg','PBtmpl0000000000000060','PBtmpl0000000000000111',1227074310,'PBtmpl0000000000000060'),(1,NULL,'_ilRXNR3s8F2vGJ_k9ePcg','PBtmpl0000000000000060','PBtmpl0000000000000111',1226643205,'PBtmpl0000000000000060'),(1,NULL,'qaVcU0FFzzraMX_bzELqzw','PBtmpl0000000000000060','PBtmpl0000000000000111',1227074362,'PBtmpl0000000000000060'),(1,NULL,'LdiozcIUciWuvt3Z-na5Ww','PBtmpl0000000000000060','PBtmpl0000000000000060',1232673968,'PBtmpl0000000000000060'),(1,NULL,'QHn6T9rU7KsnS3Y70KCNTg','PBtmpl0000000000000060','PBtmpl0000000000000111',1233173545,'PBtmpl0000000000000060'),(1,NULL,'HW-sPoDDZR8wBZ0YgFgPtg','PBtmpl0000000000000060','PBtmpl0000000000000111',1227634350,'PBtmpl0000000000000060'),(1,NULL,'Vch1Ww7G_JpBhOhXX07RDg','PBtmpl0000000000000060','PBtmpl0000000000000111',1235705952,'PBtmpl0000000000000060'),(1,NULL,'AOjPG2NHgfL9Cq6dDJ7mew','PBtmpl0000000000000060','PBtmpl0000000000000111',1236960881,'PBtmpl0000000000000060'),(1,NULL,'jmlI9IK-lV8n2WMYmmPhAA','PBtmpl0000000000000060','PBtmpl0000000000000111',1238106173,'PBtmpl0000000000000060'),(1,NULL,'6uvSLY-ak_w4p_wS8q33cA','PBtmpl0000000000000060','PBtmpl0000000000000111',1239213092,'PBtmpl0000000000000060'),(1,NULL,'GaBAW-2iVhLMJaZQzVLE5A','stevestyle000000000003','PBtmpl0000000000000111',1240103565,'stevestyle000000000003'),(1,'Templates for the Friend Manager
','lo1rpxn3t8YPyKGers5eQg','PBtmpl0000000000000060','PBtmpl0000000000000111',1238625621,'PBtmpl0000000000000060'),(1,NULL,'aNNC62qLAS6TB-0_MCYjsw','PBtmpl0000000000000060','PBtmpl0000000000000060',1246969327,'PBtmpl0000000000000060'),(1,NULL,'BFfNj5wA9bDw8H3cnr8pTw','PBtmpl0000000000000060','PBtmpl0000000000000060',1247046273,'PBtmpl0000000000000060'),(1,NULL,'f_tn9FfoSfKWX43F83v_3w','PBtmpl0000000000000060','PBtmpl0000000000000060',1247053009,'PBtmpl0000000000000060'),(1,NULL,'oGfxez5sksyB_PcaAsEm_Q','PBtmpl0000000000000060','PBtmpl0000000000000060',1247053097,'PBtmpl0000000000000060'),(1,NULL,'tPagC0AQErZXjLFZQ6OI1g','PBtmpl0000000000000060','PBtmpl0000000000000060',1246966459,'PBtmpl0000000000000060'),(1,NULL,'GYaFxnMu9UsEG8oanwB6TA','PBtmpl0000000000000060','PBtmpl0000000000000060',1246965871,'PBtmpl0000000000000060'),(1,NULL,'VZK3CRgiMb8r4dBjUmCTgQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1247046242,'PBtmpl0000000000000060'),(1,NULL,'tXwf1zaOXTvsqPn6yu-GSw','PBtmpl0000000000000060','PBtmpl0000000000000060',1246965607,'PBtmpl0000000000000060'),(1,'Who better to host your WebGUI sites than Plain Black. Let us deal with upgrades, security, and server management. Doing so lets you focus on building your WebGUI site, which is where your time and expertise should be spent. And when you sign up with hosting , online support is included!
','iCYOjohB9SKvAPr6bXElKA','stevestyle000000000003','stevestyle000000000003',1247779898,'stevestyle000000000003'),(1,NULL,'5bnNzteN7w3NnK9mF4XiCg','PBtmpl0000000000000060','PBtmpl0000000000000060',1250243000,'PBtmpl0000000000000060'),(1,NULL,'RSAMkc6WQmfRE3TOr1_3Mw','PBtmpl0000000000000060','PBtmpl0000000000000111',1250243000,'PBtmpl0000000000000060'),(1,NULL,'fowHfgOkJtAxdst7rugTog','PBtmpl0000000000000060','PBtmpl0000000000000111',1252595993,'PBtmpl0000000000000060'),(1,NULL,'TvOZs8U1kRXLtwtmyW75pg','PBtmpl0000000000000060','PBtmpl0000000000000060',1256092368,'PBtmpl0000000000000060'),(1,NULL,'brxm_faNdZX5tRo3p50g3g','PBtmpl0000000000000060','PBtmpl0000000000000111',1256092368,'PBtmpl0000000000000060'),(1,NULL,'4qh0kIsFUdd4Ox-Iu1JZgg','PBtmpl0000000000000060','PBtmpl0000000000000111',1257311886,'PBtmpl0000000000000060'),(1,'
','-K8Hj45mbelljN9-0CXZxg','PBtmpl0000000000000060','PBtmpl0000000000000060',1257311887,'PBtmpl0000000000000060'),(1,NULL,'RrV4aAPnn4dM0ZcU3OXnlw','PBtmpl0000000000000060','PBtmpl0000000000000060',1258524916,'PBtmpl0000000000000060'),(1,NULL,'P_4uog81vSUK4KxuW_4GUA','PBtmpl0000000000000060','PBtmpl0000000000000111',1258524916,'PBtmpl0000000000000060'),(1,NULL,'1z9J1O08n_7gVVlBwSRBJQ','PBtmpl0000000000000060','PBtmpl0000000000000111',1269401468,'PBtmpl0000000000000060'),(1,NULL,'xSmREZO3GNzK3M5PaueOOQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'0bx-xoL8TSXXubFuqKAoVQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'taX2UYkFF21ALpFZY2rhMw','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'K0q_N885Httqev1VCqUWxg','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'fq1ZkYhH24R5tb96kuT10Q','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'oHk7fAFhEEkB7dHzi0QOQA','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401468,'PBtmpl0000000000000060'),(1,NULL,'9M-lrlPQWeeNWfvnDnK_Xg','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401469,'PBtmpl0000000000000060'),(1,NULL,'_gBYAdTcbkiyamnqi2Xskg','PBtmpl0000000000000060','PBtmpl0000000000000060',1269401469,'PBtmpl0000000000000060'),(1,NULL,'0iMMbGN3BevuCBHjjLiQNA','PBtmpl0000000000000060','PBtmpl0000000000000111',1269401469,'PBtmpl0000000000000060'),(1,NULL,'6A4yIjWwJfIE0Ep-I0jutg','PBtmpl0000000000000060','PBtmpl0000000000000111',1269401469,'PBtmpl0000000000000060'),(1,NULL,'aNmgn0cd6tldmC1FpW4KbA','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032714,'PBtmpl0000000000000060'),(1,NULL,'jEz8iTGNWEt2I05IhVV19Q','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032715,'PBtmpl0000000000000060'),(0,NULL,'t87D1138NhPHhA23-hozBA','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032716,'PBtmpl0000000000000060'),(0,NULL,'QtBumey5ffc-xffRp1-7Aw','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032716,'PBtmpl0000000000000060'),(0,NULL,'Am1J-meNBmhqFfEIWy6Gag','OiJNwP1gAlcva8_yOtL4gA','PBtmpl0000000000000111',1273032718,'PBtmpl0000000000000060'),(1,NULL,'x_hiUi1XZloBvV47Obnu8Q','OiJNwP1gAlcva8_yOtL4gA','PBtmpl0000000000000111',1273032718,'PBtmpl0000000000000060'),(0,NULL,'UUwEL6hLEPdrnkZnKRzFYQ','OiJNwP1gAlcva8_yOtL4gA','PBtmpl0000000000000111',1273032718,'PBtmpl0000000000000060'),(1,'Templates and images for the \"Underground\" style from StyleShout.com
','CQp-RFA2pMh5lFSggPPPYg','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032719,'PBtmpl0000000000000060'),(1,NULL,'_Mi_NTd3x8UB96LWezWHnw','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032719,'PBtmpl0000000000000060'),(1,NULL,'g3JH1PRq6m6Bj_PnGpcrSQ','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032719,'PBtmpl0000000000000060'),(1,'This folder holds prototype WebGUI assets with the correct templates pre-selected.
','G0hl4VilbFKipToyxKqFrg','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032719,'PBtmpl0000000000000060'),(1,NULL,'GWU2qZqe6yEuAKG-5HtBdg','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032719,'PBtmpl0000000000000060'),(1,NULL,'AsfpsOpsGzZCb9m7MyxPuw','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032720,'PBtmpl0000000000000060'),(1,NULL,'n-Vr_wgxOkwiHGt1nJto9w','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032720,'PBtmpl0000000000000060'),(1,NULL,'jmqLxnoWb6p92Cr12lf1hw','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032720,'PBtmpl0000000000000060'),(1,NULL,'8E2UOnj_XPEghTj7nfVM0g','Qk24uXao2yowR6zxbVJ0xA','PBtmpl0000000000000111',1273032720,'PBtmpl0000000000000060'),(1,NULL,'Q4uX_C557arTp6D_jwB1jQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032720,'PBtmpl0000000000000060'),(1,NULL,'1qFjOEiILIwr1xB5_ebppQ','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032721,'PBtmpl0000000000000060'),(1,NULL,'xD76UfQ_JnSgTLBNvytcpQ','PBtmpl0000000000000060','PBtmpl0000000000000111',1273032721,'PBtmpl0000000000000060'),(0,NULL,'h0bOzz7WvdaVZXsjpwtkww','KKt0VB_eoQxw9xEsHsAhag','PBtmpl0000000000000111',1273032721,'PBtmpl0000000000000060'),(1,NULL,'qFOfW1sKyOTnGNcP6BXbwg','6D98D8TIuhExiSoo2U1eqw','PBtmpl0000000000000111',1273032721,'PBtmpl0000000000000060'),(1,NULL,'G5DgNizuG3jXkjPp6UaGrA','PBtmpl0000000000000060','PBtmpl0000000000000060',1273032722,'PBtmpl0000000000000060'),(1,NULL,'GNOAsX98vCsl0JRwfwL-gg','PBtmpl0000000000000060','PBtmpl0000000000000060',1277868921,'PBtmpl0000000000000060'),(1,'
','gI_TxK-5S4DNuv42wpImmw','PBtmpl0000000000000060','PBtmpl0000000000000111',1277868923,'PBtmpl0000000000000060'),(1,NULL,'kaPRSaf8UKiskiGEgJgLAw','PBtmpl0000000000000060','PBtmpl0000000000000111',1277868924,'2p9ygcqH_Z11qOUvQ1uBvw');
-ALTER TABLE `wobject` ENABLE KEYS;
-INSERT INTO webguiVersion (webguiVersion,versionType,dateApplied) VALUES ('7.9.9','Initial Install',UNIX_TIMESTAMP());
-SET CHARACTER_SET_CLIENT = @OLD_CHARACTER_SET_CLIENT;
-SET CHARACTER_SET_RESULTS = @OLD_CHARACTER_SET_RESULTS;
-SET CHARACTER_SET_CONNECTION = @OLD_CHARACTER_SET_CONNECTION;
-SET COLLATION_CONNECTION = @OLD_COLLATION_CONNECTION;
-SET TIME_ZONE = @OLD_TIME_ZONE;
-SET UNIQUE_CHECKS = @OLD_UNIQUE_CHECKS;
-SET FOREIGN_KEY_CHECKS = @OLD_FOREIGN_KEY_CHECKS;
-SET SQL_MODE = @OLD_SQL_MODE;
-SET SQL_NOTES = @OLD_SQL_NOTES;
diff --git a/docs/upgrades/packages-7.9.3/default-wiki-front-page.wgpkg b/docs/upgrades/packages-7.9.3/default-wiki-front-page.wgpkg
deleted file mode 100644
index 5bd7d736b..000000000
Binary files a/docs/upgrades/packages-7.9.3/default-wiki-front-page.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg
deleted file mode 100644
index 822fec147..000000000
Binary files a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-edit-map-point.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg b/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg
deleted file mode 100644
index c9f92fa55..000000000
Binary files a/docs/upgrades/packages-7.9.3/home_map_map-templates_default-map-point-view.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/crystalx.wgpkg b/docs/upgrades/packages-7.9.4/crystalx.wgpkg
deleted file mode 100644
index 8b9dddb03..000000000
Binary files a/docs/upgrades/packages-7.9.4/crystalx.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/greenportal.wgpkg b/docs/upgrades/packages-7.9.4/greenportal.wgpkg
deleted file mode 100644
index 5d3f9ba65..000000000
Binary files a/docs/upgrades/packages-7.9.4/greenportal.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/root_import_account_inbox_default-inbox-view-template.wgpkg b/docs/upgrades/packages-7.9.4/root_import_account_inbox_default-inbox-view-template.wgpkg
deleted file mode 100644
index d78125402..000000000
Binary files a/docs/upgrades/packages-7.9.4/root_import_account_inbox_default-inbox-view-template.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/root_import_wiki.wgpkg b/docs/upgrades/packages-7.9.4/root_import_wiki.wgpkg
deleted file mode 100644
index 8afed4e2a..000000000
Binary files a/docs/upgrades/packages-7.9.4/root_import_wiki.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/shopping-cart-collateral-items.wgpkg b/docs/upgrades/packages-7.9.4/shopping-cart-collateral-items.wgpkg
deleted file mode 100644
index 1b6af5751..000000000
Binary files a/docs/upgrades/packages-7.9.4/shopping-cart-collateral-items.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/style-underground.wgpkg b/docs/upgrades/packages-7.9.4/style-underground.wgpkg
deleted file mode 100644
index 4149a7f5f..000000000
Binary files a/docs/upgrades/packages-7.9.4/style-underground.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/style_01.wgpkg b/docs/upgrades/packages-7.9.4/style_01.wgpkg
deleted file mode 100644
index da3c6b216..000000000
Binary files a/docs/upgrades/packages-7.9.4/style_01.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/style_02.wgpkg b/docs/upgrades/packages-7.9.4/style_02.wgpkg
deleted file mode 100644
index a73d44fa6..000000000
Binary files a/docs/upgrades/packages-7.9.4/style_02.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.4/style_03.wgpkg b/docs/upgrades/packages-7.9.4/style_03.wgpkg
deleted file mode 100644
index 1a0111228..000000000
Binary files a/docs/upgrades/packages-7.9.4/style_03.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.5/root_import_collaboration.wgpkg b/docs/upgrades/packages-7.9.5/root_import_collaboration.wgpkg
deleted file mode 100644
index f83442066..000000000
Binary files a/docs/upgrades/packages-7.9.5/root_import_collaboration.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.5/root_import_gallery-templates_default-gallery-add-archive.wgpkg b/docs/upgrades/packages-7.9.5/root_import_gallery-templates_default-gallery-add-archive.wgpkg
deleted file mode 100644
index cf6bb0c81..000000000
Binary files a/docs/upgrades/packages-7.9.5/root_import_gallery-templates_default-gallery-add-archive.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg b/docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg
deleted file mode 100644
index b4e74c04f..000000000
Binary files a/docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-add-archive.wgpkg b/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-add-archive.wgpkg
deleted file mode 100644
index a907fd1d4..000000000
Binary files a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-add-archive.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-search.wgpkg b/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-search.wgpkg
deleted file mode 100644
index 0fd040d1f..000000000
Binary files a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-search.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-view-photo.wgpkg b/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-view-photo.wgpkg
deleted file mode 100644
index ded6e284f..000000000
Binary files a/docs/upgrades/packages-7.9.6/root_import_gallery-templates_default-gallery-view-photo.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.7/root_import_gallery-templates_admin.css.wgpkg b/docs/upgrades/packages-7.9.7/root_import_gallery-templates_admin.css.wgpkg
deleted file mode 100644
index f5cd50d57..000000000
Binary files a/docs/upgrades/packages-7.9.7/root_import_gallery-templates_admin.css.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.7/root_import_gallery-templates_default-gallery-edit-album.wgpkg b/docs/upgrades/packages-7.9.7/root_import_gallery-templates_default-gallery-edit-album.wgpkg
deleted file mode 100644
index 14275ac5d..000000000
Binary files a/docs/upgrades/packages-7.9.7/root_import_gallery-templates_default-gallery-edit-album.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.8/root_import_auth_twitter_chooseusername_default-twitter-choose-username.wgpkg b/docs/upgrades/packages-7.9.8/root_import_auth_twitter_chooseusername_default-twitter-choose-username.wgpkg
deleted file mode 100644
index e024a07e9..000000000
Binary files a/docs/upgrades/packages-7.9.8/root_import_auth_twitter_chooseusername_default-twitter-choose-username.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.8/root_import_collaboration.wgpkg b/docs/upgrades/packages-7.9.8/root_import_collaboration.wgpkg
deleted file mode 100644
index 98633a498..000000000
Binary files a/docs/upgrades/packages-7.9.8/root_import_collaboration.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.8/root_import_gallery-templates.wgpkg b/docs/upgrades/packages-7.9.8/root_import_gallery-templates.wgpkg
deleted file mode 100644
index a2080830f..000000000
Binary files a/docs/upgrades/packages-7.9.8/root_import_gallery-templates.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.8/templates_thingy-default-search-thing.wgpkg b/docs/upgrades/packages-7.9.8/templates_thingy-default-search-thing.wgpkg
deleted file mode 100644
index 6076e8b0a..000000000
Binary files a/docs/upgrades/packages-7.9.8/templates_thingy-default-search-thing.wgpkg and /dev/null differ
diff --git a/docs/upgrades/upgrade_7.9.2-7.9.3.pl b/docs/upgrades/upgrade_7.9.2-7.9.3.pl
deleted file mode 100644
index 501ea26e2..000000000
--- a/docs/upgrades/upgrade_7.9.2-7.9.3.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-
-
-my $toVersion = '7.9.3';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-reindexSiteForDefaultSynopsis( $session );
-addTopLevelWikiKeywords( $session );
-renameMapPointStateColumn( $session );
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-sub renameMapPointStateColumn {
- my $session = shift;
- print "\tRename the MapPoint column state to region... " unless $quiet;
-
- $session->db->write('ALTER TABLE MapPoint CHANGE state region char(35)');
-
- print "Done.\n" unless $quiet;
-}
-
-
-#----------------------------------------------------------------------------
-sub addTopLevelWikiKeywords {
- my $session = shift;
- print "\tAdding top level keywords page to WikiMaster... " unless $quiet;
-
- my $sth = $session->db->read('DESCRIBE `WikiMaster`');
- while (my ($col) = $sth->array) {
- if ($col eq 'topLevelKeywords') {
- print "Skipped.\n" unless $quiet;
- return;
- }
- }
- $session->db->write('ALTER TABLE WikiMaster ADD COLUMN topLevelKeywords LONGTEXT');
-
- print "Done.\n" unless $quiet;
-}
-
-
-#----------------------------------------------------------------------------
-# Reindex the site to clear out default synopsis
-sub reindexSiteForDefaultSynopsis {
- my $session = shift;
- print "\tRe-indexing site to clear out default synopses... " unless $quiet;
-
- my $rs = $session->db->read("select assetId, className from asset where state='published'");
- my @searchableAssetIds;
- while (my ($id, $class) = $rs->array) {
- my $asset = WebGUI::Asset->new($session,$id,$class);
- if (defined $asset && $asset->get("state") eq "published" && ($asset->get("status") eq "approved" || $asset->get("status") eq "archived")) {
- $asset->indexContent;
- push (@searchableAssetIds, $id);
- }
- }
-
- # delete indexes of assets that are no longer searchable
- my $list = $session->db->quoteAndJoin(\@searchableAssetIds) if scalar(@searchableAssetIds);
- $session->db->write("delete from assetIndex where assetId not in (".$list.")") if $list;
-
- print "DONE!\n" unless $quiet;
-}
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.3-7.9.4.pl b/docs/upgrades/upgrade_7.9.3-7.9.4.pl
deleted file mode 100644
index 18d7d96fd..000000000
--- a/docs/upgrades/upgrade_7.9.3-7.9.4.pl
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-use WebGUI::Asset::WikiPage;
-use WebGUI::Exception;
-use WebGUI::Shop::Pay;
-
-
-my $toVersion = '7.9.4';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-addWikiSubKeywords($session);
-addSynopsistoEachWikiPage($session);
-dropVisitorAddressBooks($session);
-alterCartTable($session);
-alterAddressBookTable($session);
-addWizardHandler( $session );
-addTemplateExampleImage( $session );
-addPayDriverTemplates( $session );
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Add example images to templates
-sub addTemplateExampleImage {
- my $session = shift;
- print "\tAdding example image field to template... " unless $quiet;
-
- $session->db->write( q{
- ALTER TABLE template ADD storageIdExample CHAR(22)
- } );
-
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-
-sub addWizardHandler {
- my ( $sesssion ) = @_;
- print "\tAdding WebGUI::Wizard... " unless $quiet;
-
- if ( !grep { $_ eq 'WebGUI::Content::Wizard' } @{$session->config->get('contentHandlers')} ) {
- # Find the place of Operation and add before
- my @handlers = ();
- for my $handler ( @{$session->config->get('contentHandlers')} ) {
- if ( $handler eq 'WebGUI::Content::Operation' ) {
- push @handlers, 'WebGUI::Content::Wizard';
- }
- push @handlers, $handler;
- }
- $session->config->set('contentHandlers',\@handlers);
- }
-
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub addWikiSubKeywords {
- my $session = shift;
- print "\tAdd the WikiMaster sub-keywords table... " unless $quiet;
- # and here's our code
- $session->db->write(<getIsa($session);
- PAGE: while (1) {
- my $page = eval {$pager->()};
- next PAGE if Exception::Class->caught();
- last PAGE unless $page;
- my ($synopsis) = $page->getSynopsisAndContent(undef, $page->get('content'));
- $page->update({synopsis => $synopsis});
- }
- # and here's our code
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub dropVisitorAddressBooks {
- my $session = shift;
- print "\tDrop AddressBooks owned by Visitor... " unless $quiet;
- my $sth = $session->db->read(q|SELECT addressBookId FROM addressBook where userId='1'|);
- BOOK: while (my ($addressBookId) = $sth->array) {
- my $book = eval { WebGUI::Shop::AddressBook->new($session, $addressBookId); };
- next BOOK if Exception::Class->caught();
- $book->delete;
- }
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub alterAddressBookTable {
- my $session = shift;
- print "\tDrop sessionId from the Address Book database table... " unless $quiet;
- # and here's our code
- $session->db->write("ALTER TABLE addressBook DROP COLUMN sessionId");
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub alterCartTable {
- my $session = shift;
- print "\tAdd billing address column to the Cart table... " unless $quiet;
- # and here's our code
- $session->db->write("ALTER TABLE cart ADD COLUMN billingAddressId CHAR(22)");
- $session->db->write("ALTER TABLE cart ADD COLUMN gatewayId CHAR(22)");
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub addPayDriverTemplates {
- my $session = shift;
- print "\tAdd templates to the Payment Drivers that need them... " unless $quiet;
- # and here's our code
- my $pay = WebGUI::Shop::Pay->new($session);
- my @gateways = @{ $pay->getPaymentGateways };
- GATEWAY: foreach my $gateway (@gateways) {
- next GATEWAY unless $gateway;
- my $properties = $gateway->get;
- if ($gateway->isa('WebGUI::Shop::PayDriver::Cash')) {
- $properties->{summaryTemplateId} = '30h5rHxzE_Q0CyI3Gg7EJw';
- }
- elsif ($gateway->isa('WebGUI::Shop::PayDriver::ITransact')) {
- ##Nothing to do. This template was only changed, not added.
- }
- elsif ($gateway->isa('WebGUI::Shop::PayDriver::Ogone')) {
- $properties->{summaryTemplateId} = 'jysVZeUR0Bx2NfrKs5sulg';
- }
- elsif ($gateway->isa('WebGUI::Shop::PayDriver::PayPal::PayPalStd')) {
- $properties->{summaryTemplateId} = '300AozDaeveAjB_KN0ljlQ';
- }
- elsif ($gateway->isa('WebGUI::Shop::PayDriver::PayPal::ExpressCheckout')) {
- $properties->{summaryTemplateId} = 'GqnZPB0gLoZmqQzYFaq7bg';
- }
- else {
- die "Unknown payment driver type found. Unable to automatically upgrade.\n";
- }
- $gateway->update($properties);
- }
- print "DONE!\n" unless $quiet;
-}
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.4-7.9.5.pl b/docs/upgrades/upgrade_7.9.4-7.9.5.pl
deleted file mode 100644
index 3d5487d0f..000000000
--- a/docs/upgrades/upgrade_7.9.4-7.9.5.pl
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-use WebGUI::Workflow::Instance;
-
-
-my $toVersion = '7.9.5';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-modifySortItems( $session );
-fixRequestForApprovalScratch($session);
-addRejectNoticeSetting($session);
-updateGroupGroupingsTable($session);
-installNewCSUnsubscribeTemplate($session);
-
-finish($session); # this line required
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Adds setting which allows users to set whether or not to send reject notices
-sub addRejectNoticeSetting {
- my $session = shift;
- print "\tAdding reject notice setting... " unless $quiet;
- $session->setting->add('sendRejectNotice',1);
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-sub installNewCSUnsubscribeTemplate {
- my $session = shift;
- print "\tAdding new unsubscribe template to the CS... " unless $quiet;
- $session->db->write(q|ALTER TABLE Collaboration ADD COLUMN unsubscribeTemplateId CHAR(22) NOT NULL|);
- $session->db->write(q|UPDATE Collaboration set unsubscribeTemplateId='default_CS_unsubscribe'|);
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Add keys and indicies to groupGroupings to help speed up group queries
-sub updateGroupGroupingsTable {
- my $session = shift;
- print "\tAdding primary key and indicies to groupGroupings table... " unless $quiet;
- my $sth = $session->db->read('show create table groupGroupings');
- my ($field,$stmt) = $sth->array;
- $sth->finish;
- unless ($stmt =~ m/PRIMARY KEY/i) {
- $session->db->write("alter table groupGroupings add primary key (groupId,inGroup)");
- }
- unless ($stmt =~ m/KEY `inGroup`/i) {
- $session->db->write("alter table groupGroupings add index inGroup (inGroup)");
- }
- print "DONE!\n" unless $quiet;
-}
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub fixRequestForApprovalScratch {
- my $session = shift;
- print "\tCorrect RequestApprovalForVersionTag workflow instance data with leading commas... " unless $quiet;
- # and here's our code
- my $instances = WebGUI::Workflow::Instance->getAllInstances($session);
- INSTANCE: foreach my $instance (@{ $instances }) {
- my $messageId = $instance->getScratch('messageId');
- next INSTANCE unless $messageId;
- $messageId =~ s/^,//;
- $instance->setScratch('messageId', $messageId);
- }
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Changes sortItems to a SelectBox
-sub modifySortItems {
- my $session = shift;
- print "\tUpdating SyndicatedContent...\n" unless $quiet;
-
- require WebGUI::Form::SelectBox;
-
- print "\t\tModifying table...\n" unless $quiet;
- my $type = WebGUI::Form::SelectBox->getDatabaseFieldType;
- $session->db->write("ALTER TABLE SyndicatedContent MODIFY sortItems $type");
-
- print "\t\tConverting old values..." unless $quiet;
- $session->db->write(q{
- UPDATE SyndicatedContent
- SET sortItems = 'none'
- WHERE sortItems <> '1'
- });
- $session->db->write(q{
- UPDATE SyndicatedContent
- SET sortItems = 'pubDate_des'
- WHERE sortItems = '1'
- });
-
- # and here's our code
- print "DONE!\n" unless $quiet;
-}
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.5-7.9.6.pl b/docs/upgrades/upgrade_7.9.5-7.9.6.pl
deleted file mode 100644
index 6c382052d..000000000
--- a/docs/upgrades/upgrade_7.9.5-7.9.6.pl
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-
-
-my $toVersion = '7.9.6';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-fixConvertUTCMacroName($session);
-dropOldEMSTableColumn($session);
-addIndexForInbox($session);
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Add keys and indicies to groupGroupings to help speed up group queries
-sub addIndexForInbox {
- my $session = shift;
- print "\tAdding index to inbox_messageState... " unless $quiet;
- my $sth = $session->db->read('show create table inbox_messageState');
- my ($field,$stmt) = $sth->array;
- $sth->finish;
- unless ($stmt =~ m/KEY `userId_deleted_isRead`/i) {
- $session->db->write("alter table inbox_messageState add index userId_deleted_isRead (userId,deleted,isRead)");
- }
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub fixConvertUTCMacroName {
- my $session = shift;
- print "\tFix the name of the ConvertUTCToTZ macro in the config file... " unless $quiet;
- $session->config->deleteFromHash('macros', 'ConvertToUTC');
- $session->config->addToHash('macros', 'ConvertUTCToTZ', 'ConvertUTCToTZ');
- # and here's our code
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub dropOldEMSTableColumn {
- my $session = shift;
- print "\tDrop an old column from the EventMangementSystem table that is no longer used... " unless $quiet;
- $session->db->write(q|ALTER TABLE EventManagementSystem DROP COLUMN groupToApproveEvents|);
- # and here's our code
- print "DONE!\n" unless $quiet;
-}
-
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.6-7.9.7.pl b/docs/upgrades/upgrade_7.9.6-7.9.7.pl
deleted file mode 100644
index ea35f7b0a..000000000
--- a/docs/upgrades/upgrade_7.9.6-7.9.7.pl
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-use WebGUI::Asset::Wobject::Collaboration;
-use WebGUI::Exception;
-use WebGUI::Workflow::Cron;
-use WebGUI::Utility qw/isIn/;
-
-
-my $toVersion = '7.9.7';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-restoreDefaultCronJobs($session);
-restoreCsCronJobs($session);
-cleanup_inbox_messageStateTable($session);
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub cleanup_inbox_messageStateTable {
- my $session = shift;
- print "\tDelete dead entries from the inbox_MessageState table. This may take a long time... " unless $quiet;
- # and here's our code
- my $source = $session->db->read("select messageId from inbox_messageState s where not exists(select messageId from inbox where messageId = s.messageId)");
- my $cleaner = $session->db->prepare("delete from inbox_messageState where messageId=?");
- while (my ($messageId) = $source->array) {
- $cleaner->execute([$messageId]);
- }
- $source->finish;
- $cleaner->finish;
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub restoreDefaultCronJobs {
- my $session = shift;
- # and here's our code
- print "\tRestore missing default cron jobs that may have been deleted... " unless $quiet;
- my $tasks = WebGUI::Workflow::Cron->getAllTasks($session);
- my @taskIds = map { $_->getId } @{ $tasks };
- if (! isIn('pbcron0000000000000001', @taskIds)) {
- print "\n\t\tRestoring Daily Maintenance Task... " unless $quiet;
- WebGUI::Workflow::Cron->create($session, {
- title => "Daily Maintenance", dayOfMonth => '*',
- enabled => 1, monthOfYear => '*',
- runOnce => 0, dayOfWeek => '*',
- minuteOfHour => 30, workflowId => 'pbworkflow000000000001',
- hourOfDay => 23, priority => 3,
- },
- 'pbcron0000000000000001');
- }
- if (! isIn('pbcron0000000000000002', @taskIds)) {
- print "\n\t\tRestoring Weekly Maintenance Task... " unless $quiet;
- WebGUI::Workflow::Cron->create($session, {
- title => "Weekly Maintenance", dayOfMonth => '*',
- enabled => 1, monthOfYear => '*',
- runOnce => 0, dayOfWeek => '0',
- minuteOfHour => 30, workflowId => 'pbworkflow000000000002',
- hourOfDay => 1, priority => 3,
- },
- 'pbcron0000000000000002');
- }
- if (! isIn('pbcron0000000000000003', @taskIds)) {
- print "\n\t\tRestoring Hourly Maintenance Task... " unless $quiet;
- WebGUI::Workflow::Cron->create($session, {
- title => "Hourly Maintenance", dayOfMonth => '*',
- enabled => 1, monthOfYear => '*',
- runOnce => 0, dayOfWeek => '*',
- minuteOfHour => 15, workflowId => 'pbworkflow000000000004',
- hourOfDay => '*', priority => 3,
- },
- 'pbcron0000000000000003');
- }
- if (! isIn('pbcron0000000000000004', @taskIds)) {
- print "\n\t\tRestoring Email Delivery Task... " unless $quiet;
- WebGUI::Workflow::Cron->create($session, {
- title => "Send Queued Email Messages Every 5 Minutes",
- dayOfMonth => '*',
- enabled => 1, monthOfYear => '*',
- runOnce => 0, dayOfWeek => '*',
- minuteOfHour => '*/5', workflowId => 'pbworkflow000000000007',
- hourOfDay => '*', priority => 3,
- },
- 'pbcron0000000000000004');
- }
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub restoreCsCronJobs {
- my $session = shift;
- print "\tRestore missing Collaboration System cron jobs that may have been deleted... " unless $quiet;
- my $i18n = WebGUI::International->new($session, "Asset_Collaboration");
- my $getCs = WebGUI::Asset::Wobject::Collaboration->getIsa($session);
- CS: while (1) {
- my $cs = eval { $getCs->(); };
- if (my $e = Exception::Class->caught()) {
- $session->log->error($@);
- next CS;
- }
- last CS unless $cs;
- ##Do something useful with $product
- my $cron = undef;
- if ($cs->get("getMailCronId")) {
- $cron = WebGUI::Workflow::Cron->new($session, $cs->get("getMailCronId"));
- }
- next CS if $cron;
- $cron = WebGUI::Workflow::Cron->create($session, {
- title => $cs->getTitle." ".$i18n->get("mail"),
- minuteOfHour => "*/".($cs->get("getMailInterval")/60),
- className => (ref $cs),
- methodName => "new",
- parameters => $cs->getId,
- workflowId => "csworkflow000000000001"
- });
- $cs->update({getMailCronId=>$cron->getId});
- if ($cs->get("getMail")) {
- $cron->set({enabled=>1,title=>$cs->getTitle." ".$i18n->get("mail"), minuteOfHour=>"*/".($cs->get("getMailInterval")/60)});
- } else {
- $cron->set({enabled=>0,title=>$cs->getTitle." ".$i18n->get("mail"), minuteOfHour=>"*/".($cs->get("getMailInterval")/60)});
- }
-
- }
- print "DONE!\n" unless $quiet;
-}
-
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.7-7.9.8.pl b/docs/upgrades/upgrade_7.9.7-7.9.8.pl
deleted file mode 100644
index 5a9b7280b..000000000
--- a/docs/upgrades/upgrade_7.9.7-7.9.8.pl
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
- $webguiRoot = "../..";
- unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-use WebGUI::Asset::Wobject::Collaboration;
-use WebGUI::Asset::Post::Thread;
-use WebGUI::ProfileField;
-
-my $toVersion = '7.9.8';
-my $quiet; # this line required
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-changeFirstDayOfWeekDefault($session);
-updateLastPostCS($session);
-updateLastPostThread($session);
-addTwitterAuth( $session );
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-# my $session = shift;
-# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-# # and here's our code
-# print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Add twitter auth and macro
-sub addTwitterAuth {
- my $session = shift;
- print "\tAdding twitter auth method... " unless $quiet;
-
- $session->config->addToArray( 'authMethods', 'Twitter' );
- $session->config->addToHash( 'macros', "TwitterLogin" => "TwitterLogin" );
- $session->setting->set( 'twitterEnabled', 0 );
- $session->setting->set( 'twitterTemplateIdChooseUsername', 'mfHGkp6t9gdclmzN33OEnw' );
-
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub changeFirstDayOfWeekDefault {
- my $session = shift;
- print "\tMake the default for firstDayOfWeek a number instead of a string... " unless $quiet;
- # and here's our code
- my $profileField = WebGUI::ProfileField->new($session, 'firstDayOfWeek');
- my $properties = $profileField->get();
- $properties->{dataDefault} = 0;
- $profileField->set($properties);
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub updateLastPostCS {
- my $session = shift;
- print "\tUpdating last post information in every Collaboration System. This could take a very long time... " unless $quiet;
- # and here's our code
- my $getCs = WebGUI::Asset::Wobject::Collaboration->getIsa($session);
- CS: while (my $cs = eval { $getCs->() } ) {
- next CS if Exception::Class->caught();
- last CS if ! $cs;
- next CS unless $cs->get('lastPostId');
- my $lastPost = WebGUI::Asset->newByDynamicClass($session, $cs->get('lastPostId'));
- next CS unless $lastPost && $lastPost->get('status') eq 'archived';
- $lastPost->disqualifyAsLastPost;
- }
- print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub updateLastPostThread {
- my $session = shift;
- print "\tUpdating last post information in every Thread. This could also take a very long time... " unless $quiet;
- # and here's our code
- my $getThread = WebGUI::Asset::Wobject::Collaboration->getIsa($session);
- THREAD: while (my $thread = eval { $getThread->() } ) {
- next THREAD if Exception::Class->caught();
- last THREAD if ! $thread;
- next THREAD unless $thread->get('lastPostId');
- my $lastPost = WebGUI::Asset->newByDynamicClass($session, $thread->get('lastPostId'));
- next THREAD unless $lastPost && $lastPost->get('status') eq 'archived';
- $lastPost->disqualifyAsLastPost;
- }
- print "DONE!\n" unless $quiet;
-}
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
- my $session = shift;
- my $file = shift;
-
- print "\tUpgrading package $file\n" unless $quiet;
- # Make a storage location for the package
- my $storage = WebGUI::Storage->createTemp( $session );
- $storage->addFileFromFilesystem( $file );
-
- # Import the package into the import node
- my $package = eval {
- my $node = WebGUI::Asset->getImportNode($session);
- $node->importPackage( $storage, {
- overwriteLatest => 1,
- clearPackageFlag => 1,
- setDefaultTemplate => 1,
- } );
- };
-
- if ($package eq 'corrupt') {
- die "Corrupt package found in $file. Stopping upgrade.\n";
- }
- if ($@ || !defined $package) {
- die "Error during package import on $file: $@\nStopping upgrade\n.";
- }
-
- return;
-}
-
-#-------------------------------------------------
-sub start {
- my $configFile;
- $|=1; #disable output buffering
- GetOptions(
- 'configFile=s'=>\$configFile,
- 'quiet'=>\$quiet
- );
- my $session = WebGUI::Session->open($webguiRoot,$configFile);
- $session->user({userId=>3});
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->set({name=>"Upgrade to ".$toVersion});
- return $session;
-}
-
-#-------------------------------------------------
-sub finish {
- my $session = shift;
- updateTemplates($session);
- my $versionTag = WebGUI::VersionTag->getWorking($session);
- $versionTag->commit;
- $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
- $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
- my $session = shift;
- return undef unless (-d "packages-".$toVersion);
- print "\tUpdating packages.\n" unless ($quiet);
- opendir(DIR,"packages-".$toVersion);
- my @files = readdir(DIR);
- closedir(DIR);
- my $newFolder = undef;
- foreach my $file (@files) {
- next unless ($file =~ /\.wgpkg$/);
- # Fix the filename to include a path
- $file = "packages-" . $toVersion . "/" . $file;
- addPackage( $session, $file );
- }
-}
-
-#vim:ft=perl
diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index db3e03607..2eecedc2d 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -850,7 +850,7 @@ sub www_inviteUser {
$var->{'submit_button' } = WebGUI::Form::submit($session,{});
$var->{'form_footer' } = WebGUI::Form::formFooter($session, {});
- $var->{'back_url' } = $session->env->get("HTTP_REFERER") || $var->{'view_inbox_url'};
+ $var->{'back_url' } = $session->request->referer || $var->{'view_inbox_url'};
#Add common template variable for displaying the inbox
$self->appendCommonVars($var);
@@ -1099,7 +1099,7 @@ sub www_sendMessage {
my $messageId = $form->get("messageId");
my $userId = $form->get("userId");
my $pageUrl = $session->url->page;
- my $backUrl = $session->env->get("HTTP_REFERER") || $var->{'view_inbox_url'};
+ my $backUrl = $session->request->referer || $var->{'view_inbox_url'};
my $errorMsg = "";
if($messageId) {
diff --git a/lib/WebGUI/AdSpace.pm b/lib/WebGUI/AdSpace.pm
index 4b670b70b..e898f4b16 100644
--- a/lib/WebGUI/AdSpace.pm
+++ b/lib/WebGUI/AdSpace.pm
@@ -52,7 +52,7 @@ sub countClick {
my $session = shift;
my $id = shift;
my ($url) = $session->db->quickArray("select url from advertisement where adId=?",[$id]);
- return $url if $session->env->requestNotViewed();
+ return $url if $session->request->requestNotViewed();
$session->db->write("update advertisement set clicks=clicks+1 where adId=?",[$id]);
return $url;
}
@@ -119,7 +119,7 @@ A boolean that tells the ad system not to count this impression if true.
sub displayImpression {
my $self = shift;
my $dontCount = shift;
- return '' if $self->session->env->requestNotViewed();
+ return '' if $self->session->request->requestNotViewed();
my ($id, $ad, $priority, $clicks, $clicksBought, $impressions, $impressionsBought) = $self->session->db->quickArray("select adId, renderedAd, priority, clicks, clicksBought, impressions, impressionsBought from advertisement where adSpaceId=? and isActive=1 order by nextInPriority asc limit 1",[$self->getId]);
unless ($dontCount) {
my $isActive = 1;
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index f09fcbb5a..f70152340 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -588,8 +588,8 @@ to SSL.
sub checkView {
my $self = shift;
return $self->session->privilege->noAccess() unless $self->canView;
- my ($conf, $env, $var, $http) = $self->session->quick(qw(config env var http));
- if ($conf->get("sslEnabled") && $self->get("encryptPage") && ! $env->sslRequest) {
+ my ($conf, $var, $http) = $self->session->quick(qw(config var http));
+ if ($conf->get("sslEnabled") && $self->get("encryptPage") && ! $self->session->request->secure) {
# getUrl already changes url to https if 'encryptPage'
$http->setRedirect($self->getUrl);
$http->sendHeader;
@@ -1726,7 +1726,7 @@ sub getWwwCacheKey {
my $session = $self->session;
my $method = shift;
my $cacheKey = join '_', @_, $self->getId;
- if ($session->env->sslRequest) {
+ if ($session->request->secure) {
$cacheKey .= '_ssl';
}
return $cacheKey;
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index 6c9cb081f..21fad7b3b 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -697,7 +697,7 @@ sub processCommentEditForm {
;
my $visitorIp = $session->user->isVisitor
- ? $session->env->get("REMOTE_ADDR")
+ ? $session->request->remote_host
: undef
;
diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index d2239fad1..f6c9fbb7e 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -350,7 +350,7 @@ sub hasRated {
my $hasRated = $self->session->db->quickScalar("select count(*) from MatrixListing_rating where
((userId=? and userId<>'1') or (userId='1' and ipAddress=?)) and listingId=?",
- [$session->user->userId,$session->env->get("HTTP_X_FORWARDED_FOR"),$self->getId]);
+ [$session->user->userId,$session->request->env->{"HTTP_X_FORWARDED_FOR"}, $self->getId]);
return $hasRated;
}
@@ -372,7 +372,7 @@ sub incrementCounter {
my $db = $self->session->db;
my $counter = shift;
- my $currentIp = $self->session->env->get("HTTP_X_FORWARDED_FOR");
+ my $currentIp = $self->session->request->env->{"HTTP_X_FORWARDED_FOR"};
unless ($self->get($counter."LastIp") && ($self->get($counter."LastIp") eq $currentIp)) {
$self->update({
@@ -528,7 +528,7 @@ sub setRatings {
$db->write("insert into MatrixListing_rating
(userId, category, rating, timeStamp, listingId, ipAddress, assetId) values (?,?,?,?,?,?,?)",
[$session->user->userId,$category,$ratings->{$category},time(),$self->getId,
- $session->env->get("HTTP_X_FORWARDED_FOR"),$matrixId]);
+ $session->request->env->{"HTTP_X_FORWARDED_FOR"}, $matrixId]);
}
my $sql = "from MatrixListing_rating where listingId=? and category=?";
my $sum = $db->quickScalar("select sum(rating) $sql", [$self->getId,$category]);
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index be95e1534..2a9ba3c56 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -120,8 +120,8 @@ sub _fixReplyCount {
orderByClause => 'assetData.revisionDate desc',
limit => 1,
} )->[0];
-
- if (my $lastPost = WebGUI::Asset->newById( $self->session, $lastPostId ) ) {
+ my $lastPost = eval { WebGUI::Asset->newById( $self->session, $lastPostId ); };
+ if ( ! Exception::Class->caught() ) {
$asset->incrementReplies( $lastPost->revisionDate, $lastPost->getId );
}
else {
@@ -293,23 +293,30 @@ the parent thread.
=cut
override cut => sub {
+ warn "post's cut";
my $self = shift;
# Fetch the Thread and CS before cutting the asset.
my $thread = $self->getThread;
+ warn "got thread";
my $cs = $thread->getParent;
+ warn "got cs";
# Cut the asset
my $result = super();
+ warn "called super";
# If a post is being cut update the thread reply count first
if ($thread->getId ne $self->getId) {
+ warn "calling _fixReplyCount on thread";
$self->_fixReplyCount( $thread );
}
# Update the CS reply count. This step is also necessary when a Post is cut since the Thread's incrementReplies
# also calls the CS's incrementReplies, possibly with the wrong last post Id.
+ warn "calling _fixReplyCount on cs";
$self->_fixReplyCount( $cs );
+ warn "all should be well...?";
return $result;
};
@@ -823,7 +830,7 @@ sub hasRated {
return 1 if $self->isPoster;
my $flag = 0;
if ($self->session->user->isVisitor) {
- ($flag) = $self->session->db->quickArray("select count(*) from Post_rating where assetId=? and ipAddress=?",[$self->getId, $self->session->env->getIp]);
+ ($flag) = $self->session->db->quickArray("select count(*) from Post_rating where assetId=? and ipAddress=?",[$self->getId, $self->session->request->address]);
} else {
($flag) = $self->session->db->quickArray("select count(*) from Post_rating where assetId=? and userId=?",[$self->getId, $self->session->user->userId]);
}
@@ -888,7 +895,7 @@ sub insertUserPostRating {
$self->session->db->write("insert into Post_rating (assetId,userId,ipAddress,dateOfRating,rating) values (?,?,?,?,?)",
[$self->getId,
$self->session->user->userId,
- $self->session->env->getIp,
+ $self->session->request->address,
time(),
$rating,]
);
@@ -1367,7 +1374,7 @@ Updates the last post information in the parent Thread and CS if applicable.
sub setStatusUnarchived {
my ($self) = @_;
- $self->update({status=>'approved'}) if ($self->get("status") eq "archived");
+ $self->update({status=>'approved'}) if ($self->status eq "archived");
$self->qualifyAsLastPost;
}
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index d77c05c94..6fb344ca6 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -211,8 +211,9 @@ sub appendTemplateVarsFileLoop {
my $assetIds = shift;
my $session = $self->session;
- for my $assetId (@$assetIds) {
- my $asset = WebGUI::Asset->newById($session, $assetId);
+ ASSET: for my $assetId (@$assetIds) {
+ my $asset = eval { WebGUI::Asset->newById($session, $assetId); };
+ next ASSET if Exception::Class->caught();
# Set the parent
$asset->{_parent} = $self;
push @{$var->{file_loop}}, $asset->getTemplateVars;
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 49e293922..c24ce5d7a 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -310,7 +310,7 @@ sub view {
return $self->processTemplate({},$self->templateId)
unless ($proxiedUrl ne "");
- my $requestMethod = $self->session->env->get("REQUEST_METHOD") || "GET";
+ my $requestMethod = $self->session->request->method || "GET";
### Do we have cached content to get?
my $cache = $self->session->cache;
@@ -328,7 +328,7 @@ sub view {
REDIRECT: for my $redirect (0..4) { # We follow max 5 redirects to prevent bouncing/flapping
my $userAgent = new LWP::UserAgent;
- $userAgent->agent($self->session->env->get("HTTP_USER_AGENT"));
+ $userAgent->agent($self->session->request->user_agent);
$userAgent->timeout($self->timeout);
$userAgent->env_proxy;
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index b56132443..9f96e0deb 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -203,7 +203,7 @@ sub _hasVoted {
my $self = shift;
my ($hasVoted) = $self->session->db->quickArray("select count(*) from Poll_answer
where assetId=".$self->session->db->quote($self->getId)." and ((userId=".$self->session->db->quote($self->session->user->userId)."
- and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->userId)." and ipAddress='".$self->session->env->getIp."'))");
+ and userId<>'1') or (userId=".$self->session->db->quote($self->session->user->userId)." and ipAddress='".$self->session->request->address."'))");
return $hasVoted;
}
@@ -545,7 +545,7 @@ sub www_vote {
my $self = shift;
my $u;
if ($self->session->form->process("answer") ne "" && $self->session->user->isInGroup($self->get("voteGroup")) && !($self->_hasVoted())) {
- $self->setVote($self->session->form->process("answer"),$self->session->user->userId,$self->session->env->getIp);
+ $self->setVote($self->session->form->process("answer"),$self->session->user->userId,$self->session->request->address);
if ($self->session->setting->get("useKarma")) {
$self->session->user->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
}
diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
index 1e5eaa3fc..9851078b1 100644
--- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm
+++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm
@@ -1044,7 +1044,7 @@ sub www_drawGanttChart {
}
#Adjust top for MSIE
- my $isMSIE = ($session->env->get("HTTP_USER_AGENT") =~ /msie/i);
+ my $isMSIE = ($session->env->request->user_agent =~ /msie/i);
my $divTop = $isMSIE ? 45 : 45;
#Start at 45 px and add 20px as the start of the new task
#Set the propert mutiplier
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 3b2684268..704d9ffb7 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -2045,7 +2045,7 @@ sub responseId {
my $ignoreRevisionDate = $opts{ignoreRevisionDate};
my $user = WebGUI::User->new( $self->session, $userId );
- my $ip = $self->session->env->getIp;
+ my $ip = $self->session->request->address;
my $responseId = $self->{responseId};
return $responseId if $responseId;
@@ -2178,7 +2178,7 @@ sub canTakeSurvey {
}
my $maxResponsesPerUser = $self->maxResponsesPerUser;
- my $ip = $self->session->env->getIp;
+ my $ip = $self->session->request->address;
my $userId = $self->session->user->userId();
my $takenCount = 0;
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index c046cf826..d9dd603ab 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -565,7 +565,7 @@ sub editThingDataSave {
if ($thingDataId eq "new"){
$thingData{dateCreated} = time();
$thingData{createdById} = $session->user->userId;
- $thingData{ipAddress} = $session->env->getIp;
+ $thingData{ipAddress} = $session->request->address;
}
else {
%thingData = $session->db->quickHash("select * from ".$session->db->dbh->quote_identifier("Thingy_".$thingId)
diff --git a/lib/WebGUI/AssetCollateral/DataForm/Entry.pm b/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
index 650a9f099..9b636586c 100644
--- a/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
+++ b/lib/WebGUI/AssetCollateral/DataForm/Entry.pm
@@ -301,7 +301,7 @@ sub new {
}
else {
$self->user($session->user);
- $self->ipAddress($session->env->getIp);
+ $self->ipAddress($session->request->address);
$self->submissionDate(WebGUI::DateTime->new($session, time));
$entryData{id $self} = {};
}
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index ab068d7f6..607eb1f00 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -161,6 +161,7 @@ sub importAssetData {
WebGUI::Asset->loadModule( $class );
my %properties = %{ $data->{properties} };
+ delete $properties{tagId};
if ($options->{inheritPermissions}) {
delete $properties{ownerUserId};
delete $properties{groupIdView};
@@ -173,6 +174,13 @@ sub importAssetData {
$properties{isDefault} = 1;
}
+ if ($options->{clearPackageFlag}) {
+ $properties{isPackage} = 0;
+ }
+ if ($options->{setDefaultTemplate}) {
+ $properties{isDefault} = 1;
+ }
+
my $asset = eval { $class->new($session, $id, $version); };
if (! Exception::Class->caught()) { # update an existing revision
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index 780eac849..8f21cd39b 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -100,8 +100,8 @@ sub _logLogin {
$_[0],
$_[1],
time(),
- $self->session->env->getIp,
- $self->session->env->get("HTTP_USER_AGENT"),
+ $self->session->request->address,
+ $self->session->request->user_agent,
$self->session->getId,
time(),
]
@@ -539,7 +539,7 @@ sub displayLogin {
) {
my $returnUrl
= $self->session->form->get('returnUrl')
- || $self->session->url->page( $self->session->env->get('QUERY_STRING') )
+ || $self->session->url->page( $self->session->request->env->{'QUERY_STRING'} )
;
$self->session->scratch->set("redirectAfterLogin", $returnUrl);
}
diff --git a/lib/WebGUI/Auth/Twitter.pm b/lib/WebGUI/Auth/Twitter.pm
index 041c5a4da..de2408aa1 100644
--- a/lib/WebGUI/Auth/Twitter.pm
+++ b/lib/WebGUI/Auth/Twitter.pm
@@ -151,7 +151,7 @@ Get the template to choose a username
sub getTemplateChooseUsername {
my ( $self ) = @_;
my $templateId = $self->session->setting->get('twitterTemplateIdChooseUsername');
- return WebGUI::Asset::Template->new( $self->session, $templateId );
+ return WebGUI::Asset->newById( $self->session, $templateId );
}
#----------------------------------------------------------------------------
diff --git a/lib/WebGUI/Config.pm b/lib/WebGUI/Config.pm
index 2c7720cf5..7d7df3807 100644
--- a/lib/WebGUI/Config.pm
+++ b/lib/WebGUI/Config.pm
@@ -35,8 +35,6 @@ This package parses the WebGUI config file.
use WebGUI::Config;
- WebGUI::Config->loadAllConfigs($webguiRoot);
-
my $configs = WebGUI::Config->readAllConfigs;
my $config = WebGUI::Config->new($configFileName);
@@ -65,24 +63,6 @@ These subroutines are available from this package:
#-------------------------------------------------------------------
-=head2 clearCache ( )
-
-Clear the cache of in-memory configuration files. This is required by the upgrade script, which
-forks to run each upgrade. When the child is reaped, the original is untouched, so that the
-next script in the line recieves an old, in-memory config, essentially undoing any config
-changes in the first upgrade script.
-
-This is a class method.
-
-=cut
-
-sub clearCache {
- my $class = shift;
- %config = ();
-}
-
-#-------------------------------------------------------------------
-
=head2 getCookieName ( )
Returns the cookie name defined in the config file. Returns "wgSession" if one isn't defined.
@@ -112,62 +92,22 @@ sub getCookieTTL {
#-------------------------------------------------------------------
-=head2 loadAllConfigs ( webguiRoot )
-
-Reads all the config file data for all defined sites into an in-memory cache. This is a class method.
-
-=head3 webguiRoot
-
-The path to the WebGUI installation.
-
-=cut
-
-sub loadAllConfigs {
- my $class = shift;
- my $configs = $class->readAllConfigs;
- foreach my $filename (keys %{$configs}) {
- unless ($filename =~ /^demo\d/) {
- print "\tLoading ".$filename."\n";
- $config{$filename} = $configs->{$filename};
- }
- }
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 new ( webguiRoot , configFile [ , noCache ] )
+=head2 new ( configFile )
Returns a hash reference containing the configuration data. It tries to get the data out of the memory cache first, but reads the config file directly if necessary.
-=head3 webguiRoot
-
-The path to the WebGUI installation.
-
=head3 configFile
The filename of the config file to read.
-=head3 noCache
-
-A boolean value that when set to true tells the config system not to store the config in an in memory cache, in case it's loaded again later. This is mostly used when loading utility configs, like spectre.conf.
-
=cut
-around new => sub {
+around BUILDARGS => sub {
my $orig = shift;
my $class = shift;
my $filename = shift;
- my $noCache = shift;
$filename = Cwd::realpath(File::Spec->rel2abs($filename, WebGUI::Paths->configBase));
- if (exists $config{$filename}) {
- return $config{$filename};
- }
- else {
- my $self = $class->$orig($filename);
- $config{$filename} = $self unless $noCache;
- return $self;
- }
+ return $class->$orig($filename);
};
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Content/Prefetch.pm b/lib/WebGUI/Content/Prefetch.pm
index 4c61556ed..dc721a899 100644
--- a/lib/WebGUI/Content/Prefetch.pm
+++ b/lib/WebGUI/Content/Prefetch.pm
@@ -46,7 +46,7 @@ The content handler for this package.
sub handler {
my ($session) = @_;
- if ($session->env->get("HTTP_X_MOZ") eq "prefetch") { # browser prefetch is a bad thing
+ if ($session->request->env->{"HTTP_X_MOZ"} eq "prefetch") { # browser prefetch is a bad thing
$session->http->setStatus(403);
}
return undef;
diff --git a/lib/WebGUI/Exception.pm b/lib/WebGUI/Exception.pm
index 73dd2504c..0fb390cf6 100644
--- a/lib/WebGUI/Exception.pm
+++ b/lib/WebGUI/Exception.pm
@@ -286,13 +286,12 @@ use Exception::Class (
},
);
-
-
-
-
-
-
-
+{
+ package WebGUI::Error;
+ use overload '~~' => sub {
+ return $_[0]->isa($_[1]);
+ };
+}
1;
diff --git a/lib/WebGUI/Form/Captcha.pm b/lib/WebGUI/Form/Captcha.pm
index 21fab775a..1c99ac37b 100644
--- a/lib/WebGUI/Form/Captcha.pm
+++ b/lib/WebGUI/Form/Captcha.pm
@@ -111,7 +111,7 @@ sub getValue {
my $ua = LWP::UserAgent->new;
my $res = $ua->post('http://api-verify.recaptcha.net/verify', {
privatekey => $privKey,
- remoteip => $self->session->env->getIp,
+ remoteip => $self->session->request->env->{REMOTE_ADDR},
challenge => $challenge,
response => $response,
});
@@ -158,10 +158,9 @@ sub toHtml {
my $self = shift;
if ($self->session->setting->get('useRecaptcha')) {
- my $env = $self->session->env;
my $pubKey = $self->session->setting->get('recaptchaPublicKey');
my $server = "http://api.recaptcha.net";
- if ($env->sslRequest) {
+ if ($self->session->request->secure) {
$server = "https://api-secure.recaptcha.net";
}
return
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 1784b2f57..cd47e9eba 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -173,9 +173,9 @@ sub setOptions {
#Remove entries from template list that the user does not have permission to view.
for my $assetId ( keys %{$templateList} ) {
- my $asset = WebGUI::Asset::Template->newById($self->session, $assetId);
- if (!$asset->canView($self->session->user->userId)) {
- delete $templateList->{$assetId};
+ my $asset = eval { WebGUI::Asset->newById($session, $assetId); };
+ if (!Exception::Class->caught() && !$asset->canView($self->session->user->userId)) {
+ delete $templateList->{$assetId};
}
}
diff --git a/lib/WebGUI/Friends.pm b/lib/WebGUI/Friends.pm
index a8fbdea9f..210505295 100644
--- a/lib/WebGUI/Friends.pm
+++ b/lib/WebGUI/Friends.pm
@@ -15,7 +15,20 @@ package WebGUI::Friends;
=cut
use strict;
-use Class::InsideOut qw(id register public readonly);
+
+use Moose;
+
+has 'session' => (
+ is => 'ro',
+ required => 1,
+ weak_ref => 1,
+);
+
+has 'user' => (
+ is => 'ro',
+ required => 1,
+);
+
use WebGUI::DateTime;
use WebGUI::HTML;
use WebGUI::Inbox;
@@ -23,9 +36,6 @@ use WebGUI::International;
use WebGUI::User;
use WebGUI::Utility;
-readonly session => my %session;
-readonly user => my %user;
-
=head1 NAME
WebGUI::Friends
@@ -45,6 +55,20 @@ A user relationship management system.
=cut
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $className = shift;
+
+ ##Original arguments start here.
+ my $protoSession = $_[0];
+ if (blessed $protoSession && $protoSession->isa('WebGUI::Session')) {
+ my $protoUser = defined $_[1] ? $_[1] : $protoSession->user;
+ return $className->$orig(session => $protoSession, user => $protoUser,);
+ }
+ return $className->$orig(@_);
+};
+
+
#-------------------------------------------------------------------
@@ -276,16 +300,6 @@ attached to the session.
=cut
-sub new {
- my $class = shift;
- my $session = shift;
- my $user = shift || $session->user;
- my $self = register($class);
- $session{id $self} = $session;
- $user{id $self} = $user;
- return $self;
-}
-
#-------------------------------------------------------------------
=head2 rejectAddRequest ( inviteId[,sendNotification] )
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index 409096102..236f53d75 100644
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -283,7 +283,7 @@ sub clearCaches {
$stow->delete("groupObj");
$stow->delete("isInGroup");
$stow->delete("gotGroupsInGroup");
- $session->stow->delete("gotGroupsForUser");
+ $stow->delete("gotGroupsForUser");
}
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Image/Font.pm b/lib/WebGUI/Image/Font.pm
index 6a4085f1e..a14f5ef92 100644
--- a/lib/WebGUI/Image/Font.pm
+++ b/lib/WebGUI/Image/Font.pm
@@ -73,7 +73,7 @@ sub getFile {
if ($self->getStorageId) {
return WebGUI::Storage->get($self->session, $self->getStorageId)->getPath($self->getFilename);
} else {
- return WebGUI::Paths->var . '/default.ttf';
+ return WebGUI::Paths->share . '/default.ttf';
}
}
diff --git a/lib/WebGUI/Keyword.pm b/lib/WebGUI/Keyword.pm
index eaec541ee..a851718e9 100644
--- a/lib/WebGUI/Keyword.pm
+++ b/lib/WebGUI/Keyword.pm
@@ -15,7 +15,13 @@ package WebGUI::Keyword;
=cut
use strict;
-use Class::InsideOut qw(public register id);
+use Moose;
+
+has session => (
+ is => 'ro',
+ required => 1,
+);
+
use HTML::TagCloud;
use WebGUI::Paginator;
@@ -40,6 +46,17 @@ These methods are available from this class:
=cut
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $className = shift;
+
+ ##Original arguments start here.
+ my $protoSession = $_[0];
+ if (blessed $protoSession && $protoSession->isa('WebGUI::Session')) {
+ return $className->$orig(session => $protoSession);
+ }
+ return $className->$orig(@_);
+};
#-------------------------------------------------------------------
@@ -49,9 +66,6 @@ Returns a reference to the current session.
=cut
-public session => my %session;
-
-
#-------------------------------------------------------------------
=head2 deleteKeywordsForAsset ( $asset )
@@ -473,15 +487,6 @@ A reference to the current session.
=cut
-sub new {
- my $class = shift;
- my $session = shift;
- my $self = bless \do {my $s}, $class;
- register($self);
- $session{id $self} = $session;
- return $self;
-}
-
#-------------------------------------------------------------------
=head2 replaceKeyword ( { currentKeyword => $keyword1, newKeyword => $keyword2 } )
diff --git a/lib/WebGUI/Macro/Env.pm b/lib/WebGUI/Macro/Env.pm
index a12c1b779..295cf36db 100644
--- a/lib/WebGUI/Macro/Env.pm
+++ b/lib/WebGUI/Macro/Env.pm
@@ -32,7 +32,8 @@ then undef will be returned.
#-------------------------------------------------------------------
sub process {
my $session = shift;
- return $session->env->get(shift);
+ my $key = shift;
+ return $session->request->env->{$key};
}
1;
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index a2b82b8da..a9feadc7b 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -79,18 +79,18 @@ sub process {
# A hidden field with the current URL
my $returnUrl = $session->url->page;
if ( !$session->form->get("op") eq "auth" ) {
- $returnUrl .= '?' . $session->env->get( "QUERY_STRING" );
+ $returnUrl .= '?' . $session->request->env->{ "QUERY_STRING" };
}
$var{'form.returnUrl'}
= WebGUI::Form::hidden( $session, {
name => 'returnUrl',
- value => $session->url->page($session->env->get("QUERY_STRING")),
+ value => $session->url->page($session->request->env->{"QUERY_STRING"}),
});
# Fix box size
my $boxSize = $param[0];
$boxSize = 12 unless ($boxSize);
- if (index(lc($session->env->get("HTTP_USER_AGENT")),"msie") < 0) {
+ if (index(lc($session->request->user_agent),"msie") < 0) {
$boxSize = int($boxSize=$boxSize*2/3);
}
diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm
index d327c7714..2774a6c62 100644
--- a/lib/WebGUI/Macro/r_printable.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -54,7 +54,7 @@ sub process {
my $append = 'op=makePrintable';
$temp = $session->url->page($append);
$temp =~ s/\/\//\//;
- $temp = $session->url->append($temp,$session->env->get("QUERY_STRING"));
+ $temp = $session->url->append($temp,$session->request->env->{"QUERY_STRING"});
if ($param[1] ne "") {
$temp = $session->url->append($temp,'styleId='.$param[1]);
}
diff --git a/lib/WebGUI/Middleware/Maintenance.pm b/lib/WebGUI/Middleware/Maintenance.pm
new file mode 100644
index 000000000..f994a7c0b
--- /dev/null
+++ b/lib/WebGUI/Middleware/Maintenance.pm
@@ -0,0 +1,64 @@
+package WebGUI::Middleware::Maintenance;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+ WebGUI is Copyright 2001-2009 Plain Black Corporation.
+ -------------------------------------------------------------------
+ Please read the legal notices (docs/legal.txt) and the license
+ (docs/license.txt) that came with this distribution before using
+ this software.
+ -------------------------------------------------------------------
+ http://www.plainblack.com info@plainblack.com
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use parent qw(Plack::Middleware);
+
+
+=head1 NAME
+
+Package WebGUI::Content::Maintenance;
+
+=head1 DESCRIPTION
+
+A content handler that displays a maintenance page while upgrading.
+
+=head1 SYNOPSIS
+
+ enable '+WebGUI::Middleware::Maintenance';
+
+=head1 SUBROUTINES
+
+These subroutines are available from this package:
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 handler ( session )
+
+The content handler for this package.
+
+=cut
+
+sub call {
+ my $self = shift;
+ my $env = shift;
+ my $session = $env->{'webgui.session'};
+ my $upgradeState = $session->setting->get('upgradeState');
+ if ($upgradeState) {
+ if ($upgradeState eq WebGUI->VERSION) {
+ $session->setting->remove('upgradeState');
+ }
+ else {
+ return [ 503, ['Content-Type' => 'text/plain'], [ 'Service Unavailable' ] ];
+ }
+ }
+ return $self->app->($env);
+}
+
+1;
+
diff --git a/lib/WebGUI/Operation/Cron.pm b/lib/WebGUI/Operation/Cron.pm
index ccfa81e49..712bc7f1a 100644
--- a/lib/WebGUI/Operation/Cron.pm
+++ b/lib/WebGUI/Operation/Cron.pm
@@ -271,7 +271,7 @@ sub www_runCronJob {
my $session = shift;
$session->http->setMimeType("text/plain");
$session->http->setCacheControl("none");
- unless (isInSubnet($session->env->getIp, $session->config->get("spectreSubnets")) || canView($session)) {
+ unless (isInSubnet($session->request->address, $session->config->get("spectreSubnets")) || canView($session)) {
$session->errorHandler->security("make a Spectre cron job runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
return "error";
}
diff --git a/lib/WebGUI/Operation/Spectre.pm b/lib/WebGUI/Operation/Spectre.pm
index fe6253eb2..c8c3d9cec 100644
--- a/lib/WebGUI/Operation/Spectre.pm
+++ b/lib/WebGUI/Operation/Spectre.pm
@@ -59,7 +59,7 @@ sub www_spectreGetSiteData {
if (!defined $subnets) {
$subnets = [];
}
- if (!isInSubnet($session->env->getIp, $subnets)) {
+ if (!isInSubnet($session->request->address, $subnets)) {
$session->errorHandler->security("Tried to make a Spectre workflow data load request, but we're only allowed to accept requests from "
.join(",",@{$subnets}).".");
}
@@ -181,7 +181,7 @@ sub www_spectreTest {
$subnets = [];
}
- my $sessionIp = $session->env->getIp;
+ my $sessionIp = $session->request->address;
unless (isInSubnet($sessionIp, $subnets)) {
$session->errorHandler->security(
sprintf "Tried to make a Spectre workflow runner request from %s, but we're only allowed to accept requests from %s",
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 2014ee832..b7d0971bb 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -141,7 +141,7 @@ sub canUseService {
my ( $session ) = @_;
my $subnets = $session->config->get('serviceSubnets');
return 1 if !$subnets || !@{$subnets};
- return 1 if WebGUI::Utility::isInSubnet( $session->env->getIp, $subnets );
+ return 1 if WebGUI::Utility::isInSubnet( $session->request->address, $subnets );
return 0; # Don't go away mad, just go away
}
diff --git a/lib/WebGUI/Operation/Workflow.pm b/lib/WebGUI/Operation/Workflow.pm
index 1c038cc89..2806fc2ca 100644
--- a/lib/WebGUI/Operation/Workflow.pm
+++ b/lib/WebGUI/Operation/Workflow.pm
@@ -482,7 +482,7 @@ sub www_runWorkflow {
my $session = shift;
$session->http->setMimeType("text/plain");
$session->http->setCacheControl("none");
- unless (isInSubnet($session->env->getIp, $session->config->get("spectreSubnets")) || canRunWorkflow($session)) {
+ unless (isInSubnet($session->request->address, $session->config->get("spectreSubnets")) || canRunWorkflow($session)) {
$session->errorHandler->security("make a Spectre workflow runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
return "error";
}
diff --git a/lib/WebGUI/Paths.pm b/lib/WebGUI/Paths.pm
index 22238e932..7de1d2cb4 100644
--- a/lib/WebGUI/Paths.pm
+++ b/lib/WebGUI/Paths.pm
@@ -85,7 +85,7 @@ Returns the base directory of the default site uploads content.
Returns the file path of the default site create.sql script.
-=head2 var
+=head2 share
Returns the base directory for WebGUI auxiliary files.
@@ -102,12 +102,12 @@ BEGIN {
spectreConfig => catfile($root, 'etc', 'spectre.conf'),
preloadCustom => catfile($root, 'etc', 'preload.custom'),
preloadExclusions => catfile($root, 'etc', 'preload.exclude'),
- upgrades => catdir($root, 'var', 'upgrades'),
+ upgrades => catdir($root, 'share', 'upgrades'),
extras => catdir($root, 'www', 'extras'),
defaultUploads => catdir($root, 'www', 'uploads'),
- defaultCreateSQL => catdir($root, 'docs', 'create.sql'),
- var => catdir($root, 'var'),
- defaultPSGI => catdir($root, 'var', 'site.psgi'),
+ defaultCreateSQL => catdir($root, 'share', 'create.sql'),
+ share => catdir($root, 'share'),
+ defaultPSGI => catdir($root, 'share', 'site.psgi'),
);
my $meta = Class::MOP::Class->initialize(__PACKAGE__);
for my $sub (keys %paths) {
@@ -203,6 +203,7 @@ Returns the list of modules to exclude from preloading as an array.
sub preloadExclude {
my $class = shift;
my @excludes = _readTextLines($class->preloadExclusions);
+ push @excludes, 'WebGUI::Upgrade', 'WebGUI::Upgrade::*';
return @excludes;
}
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 496129b8e..a06705e0f 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -20,11 +20,12 @@ use 5.010;
use CHI;
use File::Temp qw( tempdir );
use Scalar::Util qw( weaken );
+use HTTP::Message::PSGI;
+use HTTP::Request::Common;
use WebGUI::Config;
use WebGUI::SQL;
use WebGUI::User;
use WebGUI::Session::DateTime;
-use WebGUI::Session::Env;
use WebGUI::Session::ErrorHandler;
use WebGUI::Session::Form;
use WebGUI::Session::Http;
@@ -64,7 +65,6 @@ B It is important to distinguish the difference between a WebGUI session
$session->datetime
$session->db
$session->dbSlave
- $session->env
$session->log
$session->form
$session->http
@@ -169,9 +169,15 @@ sub close {
# Kill circular references. The literal list is so that the order
# can be explicitly shuffled as necessary.
- foreach my $key (qw/_asset _datetime _icon _slave _db _env _form _http _id _output _privilege _scratch _setting _stow _style _url _user _var _cache _errorHandler _response _request/) {
+ foreach my $key (qw/_asset _datetime _icon _slave _db _form _http _id _output _privilege _scratch _setting _stow _style _url _user _var _cache _errorHandler _response _request/) {
delete $self->{$key};
}
+ $self->{closed} = 1;
+}
+
+sub closed {
+ my $self = shift;
+ return $self->{closed};
}
#-------------------------------------------------------------------
@@ -306,23 +312,6 @@ sub duplicate {
}
-#-------------------------------------------------------------------
-
-=head2 env ( )
-
-Returns a WebGUI::Session::Env object.
-
-=cut
-
-sub env {
- my $self = shift;
- unless (exists $self->{_env}) {
- $self->{_env} = WebGUI::Session::Env->new($self);
- }
- return $self->{_env};
-}
-
-
#-------------------------------------------------------------------
=head2 errorHandler ( )
@@ -480,15 +469,21 @@ sub open {
my $self = { _config => $config };
bless $self, $class;
- if ($env) {
- my $request = WebGUI::Session::Request->new($env);
- $self->{_request} = $request;
- $self->{_response} = $request->new_response( 200 );
-
- # Use the WebGUI::Session::Request object to look up the sessionId from cookies, if it
- # wasn't given explicitly
- $sessionId ||= $request->cookies->{$config->getCookieName};
+ ##No env was passed, so construct one
+ if (! $env) {
+ my $url = 'http://' . $config->get('sitename')->[0];
+ my $request = HTTP::Request::Common::GET($url);
+ $request->headers->user_agent('WebGUI');
+ $env = $request->to_psgi;
}
+
+ my $request = WebGUI::Session::Request->new($env);
+ $self->{_request} = $request;
+ $self->{_response} = $request->new_response( 200 );
+
+ # Use the WebGUI::Session::Request object to look up the sessionId from cookies, if it
+ # wasn't given explicitly
+ $sessionId ||= $request->cookies->{$config->getCookieName};
# If the sessionId is still unset or is invalid, generate a new one
if (!$sessionId || !$self->id->valid($sessionId)) {
diff --git a/lib/WebGUI/Session/Env.pm b/lib/WebGUI/Session/Env.pm
deleted file mode 100644
index 2f2965c89..000000000
--- a/lib/WebGUI/Session/Env.pm
+++ /dev/null
@@ -1,193 +0,0 @@
-package WebGUI::Session::Env;
-
-=head1 LEGAL
-
- -------------------------------------------------------------------
- WebGUI is Copyright 2001-2009 Plain Black Corporation.
- -------------------------------------------------------------------
- Please read the legal notices (docs/legal.txt) and the license
- (docs/license.txt) that came with this distribution before using
- this software.
- -------------------------------------------------------------------
- http://www.plainblack.com info@plainblack.com
- -------------------------------------------------------------------
-
-=cut
-
-use strict;
-
-=head1 NAME
-
-Package WebGUI::Session::Env
-
-=head1 DESCRIPTION
-
-This package allows you to reference environment variables.
-
-=head1 SYNOPSIS
-
-$env = WebGUI::Session::Env->new;
-
-$value = $env->get('REMOTE_ADDR');
-
-return 'not gonna see it' if $env->requestNotViewed() ;
-
-=head1 METHODS
-
-These methods are available from this package:
-
-=cut
-
-
-#-------------------------------------------------------------------
-
-=head2 callerIsSearchSite ( )
-
-Returns true if the remote address matches a site which is a known indexer or spider.
-
-=cut
-
-sub callerIsSearchSite {
-
- my $self = shift;
- my $remoteAddress = $self->getIp;
-
- return 1 if $remoteAddress =~ /203\.87\.123\.1../ # Blaiz Enterprise Rawgrunt search
- || $remoteAddress =~ /123\.113\.184\.2../ # Unknown Yahoo Robot
- || $remoteAddress == '';
-
- return 0;
-
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 clientIsSpider ( )
-
-Returns true is the client/agent is a spider/indexer or some other non-human interface, determined
-by checking the user agent against a list of known spiders.
-
-=cut
-
-
-sub clientIsSpider {
-
- my $self = shift;
- my $userAgent = $self->get('HTTP_USER_AGENT');
-
- return 1 if $userAgent eq ''
- || $userAgent =~ m<(^wre\/| # the WRE wget's http://localhost/ every 2-3 minutes 24 hours a day...
- ^morpheus|
- libwww|
- s[pb]ider|
- bot|
- robo|
- sco[ou]t|
- crawl|
- miner|
- reaper|
- finder|
- search|
- engine|
- download|
- fetch|
- scan|
- slurp)>ix;
-
- return 0;
-
-}
-
-#-------------------------------------------------------------------
-
-=head2 get( varName )
-
-Retrieves the current value of an environment variable.
-
-=head3 varName
-
-The name of the variable.
-
-=cut
-
-sub get {
- my $self = shift;
- my $var = shift;
- return $$self->{$var};
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 getIp ( )
-
-Returns the user's IP address.
-
-=cut
-
-sub getIp {
- my $self = shift;
- return $self->get('REMOTE_ADDR');
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 new ( )
-
-Constructor. Returns an env object.
-
-=cut
-
-sub new {
- my $class = shift;
- my $session = shift;
- my $env;
- if ($session->request) {
- $env = $session->request->env;
- }
- else {
- $env = {};
- }
- return bless \$env, $class;
-}
-
-#-------------------------------------------------------------------
-
-=head2 requestNotViewed ( )
-
-Returns true is the client/agent is a spider/indexer or some other non-human interface
-
-=cut
-
-sub requestNotViewed {
-
- my $self = shift;
- return $self->clientIsSpider();
- # || $self->callerIsSearchSite(); # this part is currently left out because
- # it has minimal effect and does not manage
- # IPv6 addresses. it may be useful in the
- # future though
-
-}
-
-#-------------------------------------------------------------------
-
-=head2 sslRequest ( )
-
-Returns true if a https request was made.
-
-HTTP_SSLPROXY is set by mod_proxy in the WRE so that WebGUI knows that the original request
-was made via SSL.
-
-=cut
-
-sub sslRequest {
- my $self = shift;
- return $self->get('psgi.url_scheme') eq 'https';
-}
-
-
-1;
-
diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index 0519e2ab5..887cf0ecd 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -253,7 +253,7 @@ sub security {
my $self = shift;
my $message = shift;
@_ = ($self, $self->session->user->username." (".$self->session->user->userId.") connecting from "
- .$self->session->env->getIp." attempted to ".$message);
+ .$self->session->request->address." attempted to ".$message);
goto $self->can('warn');
}
diff --git a/lib/WebGUI/Session/Request.pm b/lib/WebGUI/Session/Request.pm
index 2a9113529..393a7cf46 100644
--- a/lib/WebGUI/Session/Request.pm
+++ b/lib/WebGUI/Session/Request.pm
@@ -17,6 +17,68 @@ is created.
=head1 METHODS
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 clientIsSpider ( )
+
+Returns true is the client/agent is a spider/indexer or some other non-human interface, determined
+by checking the user agent against a list of known spiders.
+
+=cut
+
+sub clientIsSpider {
+
+ my $self = shift;
+ my $userAgent = $self->user_agent;
+
+ return 1 if $userAgent eq ''
+ || $userAgent =~ m<(^wre\/| # the WRE wget's http://localhost/ every 2-3 minutes 24 hours a day...
+ ^morpheus|
+ libwww|
+ s[pb]ider|
+ bot|
+ robo|
+ sco[ou]t|
+ crawl|
+ miner|
+ reaper|
+ finder|
+ search|
+ engine|
+ download|
+ fetch|
+ scan|
+ slurp)>ix;
+
+ return 0;
+
+}
+
+#-------------------------------------------------------------------
+
+=head2 callerIsSearchSite ( )
+
+Returns true if the remote address matches a site which is a known indexer or spider.
+
+=cut
+
+sub callerIsSearchSite {
+
+ my $self = shift;
+ my $remoteAddress = $self->address;
+
+ return 1 if $remoteAddress =~ /203\.87\.123\.1../ # Blaiz Enterprise Rawgrunt search
+ || $remoteAddress =~ /123\.113\.184\.2../ # Unknown Yahoo Robot
+ || $remoteAddress == '';
+
+ return 0;
+
+}
+
+#-------------------------------------------------------------------
+
=head2 new_response ()
Creates a new L object.
@@ -32,9 +94,29 @@ sub new_response {
return WebGUI::Session::Response->new(@_);
}
+#-------------------------------------------------------------------
+
+=head2 requestNotViewed ( )
+
+Returns true is the client/agent is a spider/indexer or some other non-human interface
+
+=cut
+
+sub requestNotViewed {
+
+ my $self = shift;
+ return $self->clientIsSpider();
+ # || $self->callerIsSearchSite(); # this part is currently left out because
+ # it has minimal effect and does not manage
+ # IPv6 addresses. it may be useful in the
+ # future though
+
+}
+
+
# This is only temporary
sub TRACE {
shift->env->{'psgi.errors'}->print(join '', @_, "\n");
}
-1;
\ No newline at end of file
+1;
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index ed449cb06..7258c4016 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -131,7 +131,7 @@ sub useMobileStyle {
if (! $session->setting->get('useMobileStyle')) {
return $self->{_useMobileStyle} = 0;
}
- my $ua = $session->env->get('HTTP_USER_AGENT');
+ my $ua = $session->request->user_agent;
for my $mobileUA (@{ $self->session->config->get('mobileUserAgents') }) {
if ($ua =~ m/$mobileUA/) {
return $self->{_useMobileStyle} = 1;
diff --git a/lib/WebGUI/Session/Url.pm b/lib/WebGUI/Session/Url.pm
index 101e8ee47..cc0d907ff 100644
--- a/lib/WebGUI/Session/Url.pm
+++ b/lib/WebGUI/Session/Url.pm
@@ -136,7 +136,7 @@ sub extras {
my $cdnCfg = $self->session->config->get('cdn');
if ( $cdnCfg and $cdnCfg->{'enabled'} and $cdnCfg->{'extrasCdn'} ) {
unless ( $path and grep $path =~ m/$_/, @{ $cdnCfg->{'extrasExclude'} } ) {
- if ($cdnCfg->{'extrasSsl'} && $self->session->env->sslRequest) {
+ if ($cdnCfg->{'extrasSsl'} && $self->session->request->secure) {
$url = $cdnCfg->{'extrasSsl'};
}
else {
@@ -258,7 +258,7 @@ Returns the URL of the page this request was refered from (no gateway, no query
sub getRefererUrl {
my $self = shift;
- my $referer = $self->session->env->get("HTTP_REFERER");
+ my $referer = $self->session->request->referer;
return undef unless ($referer);
my $url = $referer;
my $gateway = $self->session->config->get("gateway");
@@ -289,20 +289,20 @@ is not passed in, it will attempt to get one from the L method, or finally
sub forceSecureConnection {
my $self = shift;
my $url = shift;
- my ($conf, $env, $http) = $self->session->quick(qw(config env http));
+ my ($conf, $http) = $self->session->quick(qw(config http));
- if ($conf->get("sslEnabled") && !$env->sslRequest){
+ if ($conf->get("sslEnabled") && ! $self->session->request->secure){
- $url = $self->session->url->page if(! $url);
- $url = $env->get('QUERY_STRING') if(! $url);
+ my $query_string = $self->session->request->env->{'QUERY_STRING'};
+ $url = $url || $self->page || $query_string;
my $siteURL = $self->getSiteURL();
if($url !~ /^$siteURL/i){
$url = $siteURL . $url;
}
- if($env->get('QUERY_STRING')){
- $url .= "?". $env->get('QUERY_STRING');
+ if($query_string){
+ $url .= "?". $query_string;
}
if($url =~ /^http/i) {
$url =~ s/^https?/https/i;
@@ -347,14 +347,14 @@ sub getSiteURL {
unless ($self->{_siteUrl}) {
my $site = "";
my $sitenames = $self->session->config->get("sitename");
- my ($http_host,$currentPort) = split(':', $self->session->env->get("HTTP_HOST"));
+ my ($http_host,$currentPort) = split(':', $self->session->request->env->{"HTTP_HOST"});
if ($self->session->setting->get("hostToUse") eq "HTTP_HOST" and isIn($http_host,@{$sitenames})) {
$site = $http_host;
} else {
$site = $sitenames->[0];
}
my $proto = "http://";
- if ($self->session->env->sslRequest) {
+ if ($self->session->request->secure) {
$proto = "https://";
}
my $port = "";
diff --git a/lib/WebGUI/Session/Var.pm b/lib/WebGUI/Session/Var.pm
index 1dba94d22..6f611b1c0 100644
--- a/lib/WebGUI/Session/Var.pm
+++ b/lib/WebGUI/Session/Var.pm
@@ -182,7 +182,7 @@ sub new {
my $time = time();
my $timeout = $session->setting->get("sessionTimeout");
$self->{_var}{lastPageView} = $time;
- $self->{_var}{lastIP} = $session->env->getIp;
+ $self->{_var}{lastIP} = $session->request->address;
$self->{_var}{expires} = $time + $timeout;
if ($self->{_var}{nextCacheFlush} > 0 && $self->{_var}{nextCacheFlush} < $time) {
delete $self->{_var}{nextCacheFlush};
@@ -247,7 +247,7 @@ sub start {
$self->{_var} = {
expires => $time + $timeout,
lastPageView => $time,
- lastIP => $session->env->getIp,
+ lastIP => $session->request->address,
adminOn => 0,
userId => $userId
};
diff --git a/lib/WebGUI/Shop/Address.pm b/lib/WebGUI/Shop/Address.pm
index 49631c78c..4c0d8c919 100644
--- a/lib/WebGUI/Shop/Address.pm
+++ b/lib/WebGUI/Shop/Address.pm
@@ -15,7 +15,85 @@ package WebGUI::Shop::Address;
=cut
use strict;
-use Class::InsideOut qw{ :std };
+use Moose;
+use WebGUI::Definition;
+
+property label => (
+ noFormPost => 1,
+ default => '',
+);
+
+property firstName => (
+ noFormPost => 1,
+ default => '',
+);
+
+property lastName => (
+ noFormPost => 1,
+ default => '',
+);
+
+property address1 => (
+ noFormPost => 1,
+ default => '',
+);
+
+property address2 => (
+ noFormPost => 1,
+ default => '',
+);
+
+property address3 => (
+ noFormPost => 1,
+ default => '',
+);
+
+property city => (
+ noFormPost => 1,
+ default => '',
+);
+
+property state => (
+ noFormPost => 1,
+ default => '',
+);
+
+property code => (
+ noFormPost => 1,
+ default => '',
+);
+
+property country => (
+ noFormPost => 1,
+ default => '',
+);
+
+property phoneNumber => (
+ noFormPost => 1,
+ default => '',
+);
+
+property email => (
+ noFormPost => 1,
+ default => '',
+);
+
+property organization => (
+ noFormPost => 1,
+ default => '',
+);
+
+property "addressBookId" => (
+ noFormPost => 1,
+ required => 1,
+);
+
+has [ qw/addressId addressBook/] => (
+ is => 'ro',
+ required => 1,
+);
+
+use Scalar::Util qw/blessed/;
use WebGUI::Exception::Shop;
=head1 NAME
@@ -39,166 +117,30 @@ These subroutines are available from this package:
=cut
-readonly addressBook => my %addressBook;
-private properties => my %properties;
-
#-------------------------------------------------------------------
-=head2 addressBook ( )
+=head2 new ( $book, $addressId )
-Returns a reference to the Address Book.
+Constructor. Instanciates an address based upon an addressId.
-=cut
+=head2 new ( $book, $properties )
-#-------------------------------------------------------------------
+Constructor. Builds a new, default address.
-=head2 create ( addressBook, address)
+=head2 new ( $properties )
-Constructor. Adds an address to an address book. Returns a reference to the address.
+Constructor. Builds a new, default address book object in Moose style with default properties set by $properties. This does not
+persist them to the database automatically. This needs to be done via $self->write.
-=head3 addressBook
+=head3 $addressBook
-A reference to a WebGUI::Shop::AddressBook object.
+A reference to an addressBook object
-=head3 address
+=head3 $addressId
-A hash reference containing the properties to set in the address.
+The unique id of an address to instanciate.
-=cut
-
-sub create {
- my ($class, $book, $addressData) = @_;
- unless (defined $book && $book->isa("WebGUI::Shop::AddressBook")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Shop::AddressBook", got=>(ref $book), error=>"Need an address book.", param=>$book);
- }
- unless (defined $addressData && ref $addressData eq "HASH") {
- WebGUI::Error::InvalidParam->throw(param=>$addressData, error=>"Need a hash reference.");
- }
- my $id = $book->session->db->setRow("address","addressId", {addressId=>"new", addressBookId=>$book->getId});
- my $address = $class->new($book, $id);
- $address->update($addressData);
- return $address;
-}
-
-#-------------------------------------------------------------------
-
-=head2 delete ( )
-
-Removes this address from the book.
-
-=cut
-
-sub delete {
- my $self = shift;
- $self->addressBook->session->db->deleteRow("address","addressId",$self->getId);
- return undef;
-}
-
-#-------------------------------------------------------------------
-
-=head2 get ( [ property ] )
-
-Returns a duplicated hash reference of this object’s data.
-
-=head3 property
-
-Any field − returns the value of a field rather than the hash reference.
-
-=cut
-
-sub get {
- my ($self, $name) = @_;
- if (defined $name) {
- return $properties{id $self}{$name};
- }
- my %copyOfHashRef = %{$properties{id $self}};
- return \%copyOfHashRef;
-}
-
-#-------------------------------------------------------------------
-
-=head2 getHtmlFormatted ()
-
-Returns an HTML formatted address for display.
-
-=cut
-
-sub getHtmlFormatted {
- my $self = shift;
- my $address = $self->get("firstName"). " " .$self->get("lastName") . "'.$self->get("email").' ' if ($self->get("email") ne "");
- return $address;
-}
-
-#-------------------------------------------------------------------
-
-=head2 getId ()
-
-Returns the unique id of this item.
-
-=cut
-
-sub getId {
- my $self = shift;
- return $self->get("addressId");
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 new ( addressBook, addressId )
-
-Constructor. Instanciates an existing address from the database based upon addressId.
-
-=head3 addressBook
-
-A reference to a WebGUI::Shop::AdressBook object.
-
-=head3 addressId
-
-The unique id of the address to instanciate.
-
-=cut
-
-sub new {
- my ($class, $book, $addressId) = @_;
- unless (defined $book && $book->isa("WebGUI::Shop::AddressBook")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Shop::AddressBook", got=>(ref $book), error=>"Need an address book.");
- }
- unless (defined $addressId) {
- WebGUI::Error::InvalidParam->throw(error=>"Need an addressId.", param=>$addressId);
- }
- my $address = $book->session->db->quickHashRef('select * from address where addressId=?', [$addressId]);
- if ($address->{addressId} eq "") {
- WebGUI::Error::ObjectNotFound->throw(error=>"Address not found.", id=>$addressId);
- }
- if ($address->{addressBookId} ne $book->getId) {
- WebGUI::Error::ObjectNotFound->throw(error=>"Address not in this address book.", id=>$addressId);
- }
- my $self = register $class;
- my $id = id $self;
- $addressBook{ $id } = $book;
- $properties{ $id } = $address;
- return $self;
-}
-
-
-#-------------------------------------------------------------------
-
-=head2 update ( properties )
-
-Sets properties of the address.
-
-=head3 properties
+=head3 $properties
A hash reference that contains one or more of the following:
@@ -254,19 +196,165 @@ An email address for this user.
The organization or company that this user is a part of.
-=head4 addressBookId
+=cut
-The address book that this address belongs to.
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+ if (ref $_[0] eq 'HASH') {
+ my $properties = $_[0];
+ my $book = $properties->{addressBook};
+ if (! (blessed $book && $book->isa('WebGUI::Shop::AddressBook')) ) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Shop::AddressBook", got=>(ref $book), error=>"Need an address book.", param=>$book);
+ }
+ my ($addressId) = $class->_init($book);
+ $properties->{addressId} = $addressId;
+ $properties->{addressBookId} = $book->addressBookId;
+ $properties->{addressBook} = $book;
+ return $class->$orig($properties);
+ }
+ my $book = shift;
+ if (! (blessed $book && $book->isa('WebGUI::Shop::AddressBook')) ) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Shop::AddressBook", got=>(ref $book), error=>"Need an address book.", param=>$book);
+ }
+ my $argument2 = shift;
+ if (!defined $argument2) {
+ my ($addressId) = $class->_init($book);
+ my $properties = {};
+ $properties->{addressId} = $addressId;
+ $properties->{addressBookId} = $book->addressBookId;
+ $properties->{addressBook} = $book;
+ return $class->$orig($properties);
+ }
+ elsif (ref $argument2 eq 'HASH') {
+ my $properties = $argument2;
+ my ($addressId) = $class->_init($book);
+ $properties->{addressId} = $addressId;
+ $properties->{addressBookId} = $book->addressBookId;
+ $properties->{addressBook} = $book;
+ return $class->$orig($properties);
+ }
+ ##Look up one in the db
+ my $address = $book->session->db->quickHashRef("select * from address where addressId=?", [$argument2]);
+ if ($address->{addressId} eq "") {
+ WebGUI::Error::ObjectNotFound->throw(error=>"Address not found.", id=>$argument2);
+ }
+ if ($address->{addressBookId} ne $book->getId) {
+ WebGUI::Error::ObjectNotFound->throw(error=>"Address not in this address book.", id=>$argument2);
+ }
+ $address->{addressBook} = $book;
+ return $class->$orig($address);
+};
+
+#-------------------------------------------------------------------
+
+=head2 _init ( session )
+
+Builds a stub of object information in the database, and returns the newly created
+addressId, and the creationDate fields so the object can be initialized correctly.
=cut
-sub update {
- my ($self, $newProperties) = @_;
- my $id = id $self;
- foreach my $field (qw(addressBookId email organization address1 address2 address3 state code city label firstName lastName country phoneNumber)) {
- $properties{$id}{$field} = (exists $newProperties->{$field}) ? $newProperties->{$field} : $properties{$id}{$field};
- }
- $self->addressBook->session->db->setRow("address","addressId",$properties{$id});
+sub _init {
+ my $class = shift;
+ my $book = shift;
+ my $session = $book->session;
+ my $addressId = $session->id->generate;
+ $session->db->write('insert into address (addressId, addressBookId) values (?,?)', [$addressId, $book->getId]);
+ return ($addressId);
+}
+
+#-------------------------------------------------------------------
+
+=head2 addressBook ( )
+
+Returns a reference to the Address Book.
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 create ( book )
+
+Deprecated, left as a stub for existing code. Use L instead.
+
+=head3 book
+
+A reference to an address book.
+
+=cut
+
+sub create {
+ my ($class, $book) = @_;
+ return $class->new($book);
+}
+
+#-------------------------------------------------------------------
+
+=head2 delete ( )
+
+Removes this address from the book.
+
+=cut
+
+sub delete {
+ my $self = shift;
+ $self->addressBook->session->db->deleteRow("address","addressId",$self->getId);
+ return undef;
+}
+
+#-------------------------------------------------------------------
+
+=head2 getHtmlFormatted ()
+
+Returns an HTML formatted address for display.
+
+=cut
+
+sub getHtmlFormatted {
+ my $self = shift;
+ my $address = $self->firstName. " " .$self->lastName . "'.$self->email.' ' if ($self->email ne "");
+ return $address;
+}
+
+#-------------------------------------------------------------------
+
+=head2 getId ()
+
+Returns the unique id of this item.
+
+=cut
+
+sub getId {
+ my $self = shift;
+ return $self->get("addressId");
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 write ( )
+
+Store the object's properties to the db.
+
+=cut
+
+sub write {
+ my ($self) = @_;
+ my $properties = $self->get();
+ my $book = delete $properties->{addressBook};
+ $book->session->db->setRow("address","addressId",$properties);
}
diff --git a/lib/WebGUI/Shop/AddressBook.pm b/lib/WebGUI/Shop/AddressBook.pm
index a504e5c7c..fd0056d2f 100644
--- a/lib/WebGUI/Shop/AddressBook.pm
+++ b/lib/WebGUI/Shop/AddressBook.pm
@@ -2,7 +2,25 @@ package WebGUI::Shop::AddressBook;
use strict;
-use Class::InsideOut qw{ :std };
+use Moose;
+use WebGUI::Definition;
+
+property 'userId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property 'defaultAddressId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+has [ qw/addressBookId session/] => (
+ is => 'ro',
+ required => 1,
+);
+
+
use JSON;
require WebGUI::Asset::Template;
use WebGUI::Exception::Shop;
@@ -31,9 +49,103 @@ These subroutines are available from this package:
=cut
-readonly session => my %session;
-private properties => my %properties;
-private addressCache => my %addressCache;
+#-------------------------------------------------------------------
+
+=head2 new ( $session, $addressBookId )
+
+Constructor. Instanciates an address book based upon an addressBookId.
+
+=head2 new ( $session )
+
+Constructor. Builds a new, default address book object.
+
+=head2 new ( $properties )
+
+Constructor. Builds a new, default address book object in Moose style with default properties set by $properties. This does not
+persist them to the database automatically. This needs to be done via $self->write.
+
+=head3 $session
+
+A reference to the current session.
+
+=head3 $addressBookId
+
+The unique id of a cart to instanciate.
+
+=head3 $properties
+
+A hash reference that contains one or more of the following:
+
+=head4 defaultAddressId
+
+The unique id for a address attached to this cart.
+
+=head4 userId
+
+The unique id for the user who owns this cart.
+
+=cut
+
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+ if (ref $_[0] eq 'HASH') {
+ my $properties = $_[0];
+ my $session = $properties->{session};
+ if (! (blessed $session && $session->isa('WebGUI::Session')) ) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ if ($session->user->isVisitor) {
+ WebGUI::Error::InvalidParam->throw(error=>"Visitor cannot have an address book.");
+ }
+ my ($addressBookId) = $class->_init($session);
+ $properties->{addressBookId} = $addressBookId;
+ $properties->{userId} = $session->user->userId;
+ return $class->$orig($properties);
+ }
+ my $session = shift;
+ if (! (blessed $session && $session->isa('WebGUI::Session'))) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ if ($session->user->isVisitor) {
+ WebGUI::Error::InvalidParam->throw(error=>"Visitor cannot have an address book.");
+ }
+ my $argument2 = shift;
+ if (!defined $argument2) {
+ my ($addressBookId) = $class->_init($session);
+ my $properties = {};
+ $properties->{session} = $session;
+ $properties->{addressBookId} = $addressBookId;
+ $properties->{userId} = $session->user->userId;
+ return $class->$orig($properties);
+ }
+ ##Look up one in the db
+ my $book = $session->db->quickHashRef("select * from addressBook where addressBookId=?", [$argument2]);
+ if ($book->{addressBookId} eq "") {
+ WebGUI::Error::ObjectNotFound->throw(error=>"No such address book.", id=>$argument2);
+ }
+ $book->{session} = $session;
+ return $class->$orig($book);
+};
+
+#-------------------------------------------------------------------
+
+=head2 _init ( session )
+
+Builds a stub of object information in the database, and returns the newly created
+addressBookId, and the creationDate fields so the object can be initialized correctly.
+
+=cut
+
+sub _init {
+ my $class = shift;
+ my $session = shift;
+ my $addressBookId = $session->id->generate;
+ $session->db->write('insert into addressBook (addressBookId, userId) values (?,?)', [$addressBookId, $session->user->userId]);
+ return ($addressBookId);
+}
+
#-------------------------------------------------------------------
@@ -51,7 +163,8 @@ A hash reference containing address information.
sub addAddress {
my ($self, $address) = @_;
- my $addressObj = WebGUI::Shop::Address->create( $self, $address);
+ my $addressObj = WebGUI::Shop::Address->create($self);
+ $addressObj->update($address);
return $addressObj;
}
@@ -114,32 +227,19 @@ sub appendAddressFormVars {
#-------------------------------------------------------------------
-=head2 create ( session, userId )
+=head2 create ( session )
-Constructor. Creates a new address book for this user.
+Deprecated, left as a stub for existing code. Use L instead.
=head3 session
A reference to the current session.
-=head3 userId
-
-The userId for the user. Throws an exception if it is Visitor. Defaults to the session
-user if omitted.
-
=cut
sub create {
- my ($class, $session, $userId) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- $userId ||= $session->user->userId;
- if ($userId eq '1') {
- WebGUI::Error::InvalidParam->throw(error=>"Visitor cannot have an address book.");
- }
- my $id = $session->db->setRow("addressBook", "addressBookId", {addressBookId=>"new", userId=>$userId});
- return $class->new($session, $id);
+ my ($class, $session) = @_;
+ return $class->new($session);
}
#-------------------------------------------------------------------
@@ -152,9 +252,7 @@ Deletes this address book and all addresses contained in it.
sub delete {
my ($self) = @_;
- my $myId = id $self;
foreach my $address (@{$self->getAddresses}) {
- delete $addressCache{$myId}{$address->getId};
$address->delete;
}
$self->session->db->write("delete from addressBook where addressBookId=?",[$self->getId]);
@@ -181,28 +279,6 @@ sub formatCallbackForm {
#-------------------------------------------------------------------
-=head2 get ( [ property ] )
-
-Returns a duplicated hash reference of this object’s data.
-
-=head3 property
-
-Any field − returns the value of a field rather than the hash reference. See the
-C method.
-
-=cut
-
-sub get {
- my ($self, $name) = @_;
- if (defined $name) {
- return $properties{id $self}{$name};
- }
- my %copyOfHashRef = %{$properties{id $self}};
- return \%copyOfHashRef;
-}
-
-#-------------------------------------------------------------------
-
=head2 getAddress ( id )
Returns an address object.
@@ -215,11 +291,10 @@ An address object's unique id.
sub getAddress {
my ($self, $addressId) = @_;
- my $id = id $self;
- unless (exists $addressCache{$id}{$addressId}) {
- $addressCache{$id}{$addressId} = WebGUI::Shop::Address->new($self, $addressId);
+ unless (exists $self->{_addressCache}->{$addressId}) {
+ $self->{_addressCache}->{$addressId} = WebGUI::Shop::Address->new($self, $addressId);
}
- return $addressCache{$id}{$addressId};
+ return $self->{_addressCache}->{$addressId};
}
#-------------------------------------------------------------------
@@ -337,41 +412,6 @@ sub missingFields {
#-------------------------------------------------------------------
-=head2 new ( session, addressBookId )
-
-Constructor. Instanciates an addressBook based upon a addressBookId.
-
-=head3 session
-
-A reference to the current session.
-
-=head3 addressBookId
-
-The unique id of an address book to instanciate.
-
-=cut
-
-sub new {
- my ($class, $session, $addressBookId) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- unless (defined $addressBookId) {
- WebGUI::Error::InvalidParam->throw(error=>"Need an addressBookId.");
- }
- my $addressBook = $session->db->quickHashRef('select * from addressBook where addressBookId=?', [$addressBookId]);
- if ($addressBook->{addressBookId} eq "") {
- WebGUI::Error::ObjectNotFound->throw(error=>"No such address book.", id=>$addressBookId);
- }
- my $self = register $class;
- my $id = id $self;
- $session{ $id } = $session;
- $properties{ $id } = $addressBook;
- return $self;
-}
-
-#-------------------------------------------------------------------
-
=head2 newByUserId ( session, userId )
Constructor. Creates a new address book for this user if they don't have one. In any case returns a reference to the address book.
@@ -418,7 +458,7 @@ sub newByUserId {
}
else {
# nope create one for the user
- return $class->create($session);
+ return $class->new($session);
}
}
@@ -465,31 +505,15 @@ sub processAddressForm {
#-------------------------------------------------------------------
-=head2 update ( properties )
+=head2 write ( )
-Sets properties in the addressBook
-
-=head3 properties
-
-A hash reference that contains one of the following:
-
-=head4 userId
-
-Assign the user that owns this address book.
-
-=head4 defaultAddressId
-
-The id of the address to be made the default for this address book.
+Writes the object properties to the database.
=cut
-sub update {
+sub write {
my ($self, $newProperties) = @_;
- my $id = id $self;
- foreach my $field (qw(userId defaultAddressId)) {
- $properties{$id}{$field} = (exists $newProperties->{$field}) ? $newProperties->{$field} : $properties{$id}{$field};
- }
- $self->session->db->setRow("addressBook","addressBookId",$properties{$id});
+ $self->session->db->setRow("addressBook","addressBookId",$self->get());
}
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Shop/Admin.pm b/lib/WebGUI/Shop/Admin.pm
index 3bae3354d..5279990ad 100644
--- a/lib/WebGUI/Shop/Admin.pm
+++ b/lib/WebGUI/Shop/Admin.pm
@@ -1,7 +1,27 @@
package WebGUI::Shop::Admin;
use strict;
-use Class::InsideOut qw{ :std };
+
+use Moose;
+
+has session => (
+ is => 'ro',
+ required => 1,
+);
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $className = shift;
+
+ ##Original arguments start here.
+ my $protoSession = $_[0];
+ if (blessed $protoSession && $protoSession->isa('WebGUI::Session')) {
+ return $className->$orig(session => $protoSession);
+ }
+ return $className->$orig(@_);
+};
+
+
use WebGUI::AdminConsole;
use WebGUI::Exception::Shop;
use WebGUI::HTMLForm;
@@ -28,8 +48,6 @@ These subroutines are available from this package:
=cut
-readonly session => my %session;
-
#-------------------------------------------------------------------
=head2 canManage ( [ $user ] )
@@ -103,17 +121,6 @@ A reference to the current session.
=cut
-sub new {
- my ($class, $session) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- my $self = register $class;
- my $id = id $self;
- $session{ $id } = $session;
- return $self;
-}
-
#-------------------------------------------------------------------
=head2 session ()
diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm
index ffcdf8d97..61dd5c371 100644
--- a/lib/WebGUI/Shop/Cart.pm
+++ b/lib/WebGUI/Shop/Cart.pm
@@ -2,7 +2,58 @@ package WebGUI::Shop::Cart;
use strict;
-use Class::InsideOut qw{ :std };
+use Scalar::Util qw/blessed/;
+use Moose;
+use WebGUI::Definition;
+
+property 'shippingAddressId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property 'billingAddressId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property 'shipperId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property 'gatewayId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property 'posUserId' => (
+ noFormPost => 1,
+ default => '',
+);
+
+property creationDate => (
+ required => 1,
+ noFormPost => 1,
+ default => '',
+);
+has [ qw/cartId session/] => (
+ is => 'ro',
+ required => 1,
+);
+has sessionId => (
+ is => 'ro',
+ lazy => 1,
+ builder => '_default_sessionId',
+);
+sub _default_sessionId {
+ my $self = shift;
+ return $self->session->getId;
+}
+has error => (
+ is => 'rw',
+);
+
+
use JSON;
use WebGUI::Asset::Template;
use WebGUI::Exception::Shop;
@@ -38,10 +89,110 @@ These subroutines are available from this package:
=cut
-readonly session => my %session;
-private properties => my %properties;
-public error => my %error;
-private addressBookCache => my %addressBookCache;
+#-------------------------------------------------------------------
+
+=head2 new ( $session, $cartId )
+
+Constructor. Instanciates a cart based upon a cartId.
+
+=head2 new ( $session )
+
+Constructor. Builds a new, default cart object.
+
+=head2 new ( $properties )
+
+Constructor. Builds a new, default cart object in Moose style with default properties set by $properties. This does not
+persist them to the database automatically. This needs to be done via $self->write.
+
+=head3 $session
+
+A reference to the current session.
+
+=head3 $cartId
+
+The unique id of a cart to instanciate.
+
+=head3 $properties
+
+A hash reference that contains one or more of the following:
+
+=head4 shippingAddressId
+
+The unique id for a shipping address attached to this cart.
+
+=head4 billingAddressId
+
+The unique id for a billing address attached to this cart.
+
+=head4 shipperId
+
+The unique id of the configured shipping driver that will be used to ship these goods.
+
+=head4 posUserId
+
+The ID of a user being checked out, if they're being checked out by a cashier.
+
+=head4 creationDate
+
+The date the cart was created.
+
+=cut
+
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+ if (ref $_[0] eq 'HASH') {
+ my $properties = $_[0];
+ my $session = $properties->{session};
+ if (! (blessed $session && $session->isa('WebGUI::Session')) ) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ my ($cartId, $creationDate) = $class->_init($session);
+ $properties->{cartId} = $cartId;
+ $properties->{creationDate} = $creationDate;
+ return $class->$orig($properties);
+ }
+ my $session = shift;
+ if (! (blessed $session && $session->isa('WebGUI::Session'))) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ my $argument2 = shift;
+ if (!defined $argument2) {
+ my ($cartId, $creationDate) = $class->_init($session);
+ my $properties = {};
+ $properties->{session} = $session;
+ $properties->{cartId} = $cartId;
+ $properties->{creationDate} = $creationDate;
+ return $class->$orig($properties);
+ }
+ ##Look up one in the db
+ my $cart = $session->db->quickHashRef("select * from cart where cartId=?", [$argument2]);
+ if ($cart->{cartId} eq "") {
+ WebGUI::Error::ObjectNotFound->throw(error=>"No such cart.", id=>$argument2);
+ }
+ $cart->{session} = $session;
+ return $class->$orig($cart);
+};
+
+
+#-------------------------------------------------------------------
+
+=head2 _init ( session )
+
+Builds a stub of object information in the database, and returns the newly created
+cartId, and the creationDate fields so the object can be initialized correctly.
+
+=cut
+
+sub _init {
+ my $class = shift;
+ my $session = shift;
+ my $creationDate = WebGUI::DateTime->new($session)->epoch;
+ my $cartId = $session->id->generate;
+ $session->db->write('insert into cart (cartId, sessionId, creationDate) values (?,?,?)', [$cartId, $session->getId, $creationDate]);
+ return ($cartId, $creationDate);
+}
#-------------------------------------------------------------------
@@ -83,7 +234,7 @@ sub calculateShopCreditDeduction {
}
# cannot use in-shop credit on recurring items
return $self->formatCurrency(0) if $self->requiresRecurringPayment;
- return $self->formatCurrency(WebGUI::Shop::Credit->new($self->session, $self->get('posUserId'))->calculateDeduction($total));
+ return $self->formatCurrency(WebGUI::Shop::Credit->new($self->session, $self->posUserId)->calculateDeduction($total));
}
#-------------------------------------------------------------------
@@ -160,7 +311,7 @@ sub calculateTotal {
=head2 create ( session )
-Constructor. Creates a new cart object if there’s not one already attached to the current session object. Otherwise just instanciates the existing one. Returns a reference to the object.
+Deprecated, left as a stub for existing code. Use L instead.
=head3 session
@@ -170,12 +321,7 @@ A reference to the current session.
sub create {
my ($class, $session) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- my $cartId = $session->id->generate;
- $session->db->write('insert into cart (cartId, sessionId, creationDate) values (?,?,UNIX_TIMESTAMP())', [$cartId, $session->getId]);
- return $class->new($session, $cartId);
+ return $class->new($session);
}
#-------------------------------------------------------------------
@@ -230,27 +376,6 @@ sub formatCurrency {
#-------------------------------------------------------------------
-=head2 get ( [ property ] )
-
-Returns a duplicated hash reference of this object’s data.
-
-=head3 property
-
-Any field − returns the value of a field rather than the hash reference.
-
-=cut
-
-sub get {
- my ($self, $name) = @_;
- if (defined $name) {
- return $properties{id $self}{$name};
- }
- my %copyOfHashRef = %{$properties{id $self}};
- return \%copyOfHashRef;
-}
-
-#-------------------------------------------------------------------
-
=head2 getAddressBook ()
Returns a reference to the address book for the user who's cart this is.
@@ -259,11 +384,10 @@ Returns a reference to the address book for the user who's cart this is.
sub getAddressBook {
my $self = shift;
- my $id = id $self;
- unless (exists $addressBookCache{$id}) {
- $addressBookCache{$id} = WebGUI::Shop::AddressBook->newByUserId($self->session);
+ unless (exists $self->{_addressBook}) {
+ $self->{_addressBook} = WebGUI::Shop::AddressBook->newByUserId($self->session);
}
- return $addressBookCache{$id};
+ return $self->{_addressBook};
}
#-------------------------------------------------------------------
@@ -277,7 +401,7 @@ Returns the WebGUI::Shop::Address object that is attached to this cart for billi
sub getBillingAddress {
my $self = shift;
my $book = $self->getAddressBook;
- if (my $addressId = $self->get("billingAddressId")) {
+ if (my $addressId = $self->billingAddressId) {
return $book->getAddress($addressId);
}
my $address = $book->getDefaultAddress;
@@ -332,7 +456,7 @@ Returns the unique id for this cart.
sub getId {
my ($self) = @_;
- return $self->get("cartId");
+ return $self->cartId;
}
#-------------------------------------------------------------------
@@ -409,7 +533,7 @@ Returns the WebGUI::Shop::PayDriver object that is attached to this cart for pay
sub getPaymentGateway {
my $self = shift;
- return WebGUI::Shop::Pay->new($self->session)->getPaymentGateway($self->get("gatewayId"));
+ return WebGUI::Shop::Pay->new($self->session)->getPaymentGateway($self->gatewayId);
}
#-------------------------------------------------------------------
@@ -422,7 +546,7 @@ Returns the userId of the user making a purchase. If there is a cashier and the
sub getPosUser {
my $self = shift;
- if ($self->get('posUserId') ne "") {
+ if ($self->posUserId ne "") {
return WebGUI::User->new($self->session, $self->get('posUserId'));
}
return $self->session->user;
@@ -438,7 +562,7 @@ Returns the WebGUI::Shop::ShipDriver object that is attached to this cart for sh
sub getShipper {
my $self = shift;
- return WebGUI::Shop::Ship->new(session => $self->session)->getShipper($self->get("shipperId"));
+ return WebGUI::Shop::Ship->new(session => $self->session)->getShipper($self->shipperId);
}
#-------------------------------------------------------------------
@@ -452,8 +576,8 @@ Returns the WebGUI::Shop::Address object that is attached to this cart for shipp
sub getShippingAddress {
my $self = shift;
my $book = $self->getAddressBook;
- if ($self->get("shippingAddressId")) {
- return $book->getAddress($self->get("shippingAddressId"));
+ if ($self->shippingAddressId) {
+ return $book->getAddress($self->shippingAddressId);
}
my $address = $book->getDefaultAddress;
$self->update({shippingAddressId=>$address->getId});
@@ -487,41 +611,6 @@ sub hasMixedItems {
#-------------------------------------------------------------------
-=head2 new ( session, cartId )
-
-Constructor. Instanciates a cart based upon a cartId.
-
-=head3 session
-
-A reference to the current session.
-
-=head3 cartId
-
-The unique id of a cart to instanciate.
-
-=cut
-
-sub new {
- my ($class, $session, $cartId) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- unless (defined $cartId && $cartId =~ m/^[A-Za-z0-9_-]{22}$/) {
- WebGUI::Error::InvalidParam->throw(error=>"Need a cartId.");
- }
- my $cart = $session->db->quickHashRef('select * from cart where cartId=?', [$cartId]);
- if ($cart->{cartId} eq "") {
- WebGUI::Error::ObjectNotFound->throw(error=>"No such cart.", id=>$cartId);
- }
- my $self = register $class;
- my $id = id $self;
- $session{ $id } = $session;
- $properties{ $id } = $cart;
- return $self;
-}
-
-#-------------------------------------------------------------------
-
=head2 newBySession ( session )
Class method that figures out if the user has a cart in their session. If they do it returns it. If they don't it creates it and returns it.
@@ -538,8 +627,7 @@ sub newBySession {
WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
}
my $cartId = $session->db->quickScalar("select cartId from cart where sessionId=?",[$session->getId]);
- return $class->new($session, $cartId) if (defined $cartId and $cartId ne '');
- return $class->create($session);
+ return $class->new($session, $cartId); ##Falls back to creating a new cart if there's no 2nd argument
}
#-------------------------------------------------------------------
@@ -597,12 +685,12 @@ sub readyForCheckout {
if ($self->requiresShipping) {
##Must have a configured shipping id.
- if (! $self->get('shipperId')) {
+ if (! $self->shipperId) {
$self->error('no shipping method set');
return 0;
}
- my $shipper = eval { WebGUI::Shop::ShipDriver->new($session, $self->get('shipperId'))};
+ my $shipper = eval { WebGUI::Shop::ShipDriver->new($session, $self->shipperId)};
if (my $e = WebGUI::Error->caught) {
$self->error($e->error);
return 0;
@@ -628,19 +716,19 @@ sub readyForCheckout {
}
##Must have a configured payment method.
- if (! $self->get('gatewayId')) {
+ if (! $self->gatewayId) {
$self->error('no payment gateway set');
return 0;
}
- my $gateway = eval { WebGUI::Shop::PayDriver->new($session, $self->get('gatewayId'))};
+ my $gateway = eval { WebGUI::Shop::PayDriver->new($session, $self->gatewayId)};
if (my $e = WebGUI::Error->caught) {
$self->error($e->error);
return 0;
}
##Check for any other logged errors
- return 0 if $error{ id $self };
+ return 0 if $self->error;
# All checks passed so return true
return 1;
@@ -688,46 +776,17 @@ sub requiresShipping {
#-------------------------------------------------------------------
-=head2 update ( properties )
+=head2 write ( )
-Sets properties in the cart.
-
-=head3 properties
-
-A hash reference that contains one of the following:
-
-=head4 shippingAddressId
-
-The unique id for a shipping address attached to this cart.
-
-=head4 billingAddressId
-
-The unique id for a billing address attached to this cart.
-
-=head4 shipperId
-
-The unique id of the configured shipping driver that will be used to ship these goods.
-
-=head4 posUserId
-
-The ID of a user being checked out, if they're being checked out by a cashier.
-
-=head4 creationDate
-
-The date the cart was created.
+Serialize the current set of cart properties to the database.
=cut
-sub update {
- my ($self, $newProperties) = @_;
- unless (defined $newProperties && ref $newProperties eq 'HASH') {
- WebGUI::Error::InvalidParam->throw(error=>"Need a properties hash ref.");
- }
- my $id = id $self;
- foreach my $field (qw(billingAddressId shippingAddressId posUserId gatewayId shipperId creationDate)) {
- $properties{$id}{$field} = (exists $newProperties->{$field}) ? $newProperties->{$field} : $properties{$id}{$field};
- }
- $self->session->db->setRow("cart","cartId",$properties{$id});
+sub write {
+ my ($self) = @_;
+ my $properties = $self->get();
+ delete $properties->{error};
+ $self->session->db->setRow("cart", "cartId", $properties);
}
#-------------------------------------------------------------------
@@ -747,10 +806,10 @@ sub updateFromForm {
eval { $item->setQuantity($form->get("quantity-".$item->getId)) };
if (WebGUI::Error->caught("WebGUI::Error::Shop::MaxOfItemInCartReached")) {
my $i18n = WebGUI::International->new($self->session, "Shop");
- $error{id $self} = sprintf($i18n->get("too many of this item"), $item->get("configuredTitle"));
+ $self->error(sprintf($i18n->get("too many of this item"), $item->get("configuredTitle")));
}
elsif (my $e = WebGUI::Error->caught) {
- $error{id $self} = "An unknown error has occured: ".$e->message;
+ $self->error("An unknown error has occured: ".$e->message);
}
}
if (my $itemAddressId = $form->get("itemAddress_".$item->getId)) {
@@ -759,7 +818,7 @@ sub updateFromForm {
}
if ($self->hasMixedItems) {
my $i18n = WebGUI::International->new($self->session, "Shop");
- $error{id $self} = $i18n->get('mixed items warning');
+ $self->error($i18n->get('mixed items warning'));
}
my @cartItemIds = $form->process('remove_item', 'checkList');
@@ -782,7 +841,7 @@ sub updateFromForm {
my $newAddress = $book->addAddress(\%billingData);
$cartProperties->{billingAddressId} = $newAddress->get('addressId');
}
- elsif ($billingAddressId eq 'update_address' && $self->get('billingAddressId') && ! @missingBillingFields) {
+ elsif ($billingAddressId eq 'update_address' && $self->billingAddressId && ! @missingBillingFields) {
##User updated the current address
my $address = $self->getBillingAddress();
$address->update(\%billingData);
@@ -802,7 +861,7 @@ sub updateFromForm {
if ($self->requiresShipping) {
if ($form->process('sameShippingAsBilling', 'yesNo')) {
- $cartProperties->{shippingAddressId} = $self->get('billingAddressId');
+ $cartProperties->{shippingAddressId} = $self->billingAddressId;
}
else {
my %shippingData = $book->processAddressForm('shipping_');
@@ -817,7 +876,7 @@ sub updateFromForm {
my $newAddress = $book->addAddress(\%shippingData);
$cartProperties->{shippingAddressId} = $newAddress->get('addressId');
}
- elsif ($shippingAddressId eq 'update_address' && $self->get('shippingAddressId') && ! @missingShippingFields) {
+ elsif ($shippingAddressId eq 'update_address' && $self->shippingAddressId && ! @missingShippingFields) {
##User changed the address selector
my $address = $self->getBillingAddress();
$address->update(\%shippingData);
@@ -918,8 +977,8 @@ sub www_checkout {
my $self = shift;
my $session = $self->session;
##Setting a shipping address greatly simplifies the Transaction
- if (! $self->requiresShipping && ! $self->get('shippingAddressId')) {
- $self->update({shippingAddressId => $self->get('billingAddressId')});
+ if (! $self->requiresShipping && ! $self->shippingAddressId) {
+ $self->update({shippingAddressId => $self->billingAddressId});
}
if ($self->readyForCheckout()) {
my $total = $self->calculateTotal;
@@ -1049,7 +1108,7 @@ sub www_view {
# get the shipping address
my $address = eval { $self->getShippingAddress };
- if (my $e = WebGUI::Error->caught("WebGUI::Error::ObjectNotFound") && $self->get('shippingAddressId')) {
+ if (my $e = WebGUI::Error->caught("WebGUI::Error::ObjectNotFound") && $self->shippingAddressId) {
# choose another address cuz we've got a problem
$self->update({shippingAddressId=>''});
}
@@ -1125,7 +1184,7 @@ sub www_view {
$formOptions{$optionId} .= ' ('.$self->formatCurrency($options->{$optionId}{price}).')';
}
}
- my $shipperId = $self->get('shipperId');
+ my $shipperId = $self->shipperId;
if (!$shipperId && $numberOfOptions == 1) {
my ($option) = keys %{ $options };
$self->update({shipperId => $option});
@@ -1172,7 +1231,7 @@ sub www_view {
tie my %billingAddressOptions, 'Tie::IxHash';
$billingAddressOptions{'new_address'} = $i18n->get('Add new address');
- my $billingAddressId = $self->get('billingAddressId');
+ my $billingAddressId = $self->billingAddressId;
if ($billingAddressId) {
$billingAddressOptions{'update_address'} = sprintf $i18n->get('Update %s'), $self->getBillingAddress->get('label');
}
@@ -1188,7 +1247,7 @@ sub www_view {
tie my %shippingAddressOptions, 'Tie::IxHash';
$shippingAddressOptions{'new_address'} = $i18n->get('Add new address');
- my $shippingAddressId = $self->get('shippingAddressId');
+ my $shippingAddressId = $self->shippingAddressId;
if ($shippingAddressId) {
$shippingAddressOptions{'update_address'} = sprintf $i18n->get('Update %s'), $self->getShippingAddress->get('label');
}
@@ -1200,15 +1259,15 @@ sub www_view {
value => $shippingAddressId ? $shippingAddressId : 'new_address',
});
- my $shippingAddressData = $self->get('shippingAddressId') ? $self->getShippingAddress->get() : {};
- my $billingAddressData = $self->get('billingAddressId') ? $self->getBillingAddress->get() : {};
+ my $shippingAddressData = $self->shippingAddressId ? $self->getShippingAddress->get() : {};
+ my $billingAddressData = $self->billingAddressId ? $self->getBillingAddress->get() : {};
my $addressBook = $self->getAddressBook;
$addressBook->appendAddressFormVars(\%var, 'shipping_', $shippingAddressData);
$addressBook->appendAddressFormVars(\%var, 'billing_', $billingAddressData);
$var{sameShippingAsBilling} = WebGUI::Form::yesNo($session, {
name => 'sameShippingAsBilling',
- value => $self->get('billingAddressId') && $self->get('billingAddressId') eq $self->get('shippingAddressId'),
+ value => $self->billingAddressId && $self->billingAddressId eq $self->shippingAddressId,
});
}
@@ -1223,7 +1282,7 @@ sub www_view {
$var{paymentOptions} = WebGUI::Form::selectBox($session, {
name => 'gatewayId',
options => \%paymentOptions,
- value => $self->get('gatewayId') || $form->get('gatewayId') || '',
+ value => $self->gatewayId || $form->get('gatewayId') || '',
});
# POS variables
diff --git a/lib/WebGUI/Shop/Credit.pm b/lib/WebGUI/Shop/Credit.pm
index f7b02a363..9cd4efc18 100644
--- a/lib/WebGUI/Shop/Credit.pm
+++ b/lib/WebGUI/Shop/Credit.pm
@@ -1,7 +1,15 @@
package WebGUI::Shop::Credit;
use strict;
-use Class::InsideOut qw{ :std };
+use Moose;
+use Scalar::Util qw/blessed/;
+
+has [ qw/session userId/ ] => (
+ is => 'ro',
+ required => 1,
+);
+
+
use WebGUI::Shop::Admin;
use WebGUI::Exception::Shop;
use WebGUI::International;
@@ -28,8 +36,18 @@ These subroutines are available from this package:
=cut
-readonly session => my %session;
-readonly userId => my %userId;
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $className = shift;
+
+ ##Original arguments start here.
+ my $protoSession = $_[0];
+ if (blessed $protoSession && $protoSession->isa('WebGUI::Session')) {
+ return $className->$orig(session => $protoSession, userId => $_[1], );
+ }
+ return $className->$orig(@_);
+};
+
#-------------------------------------------------------------------
@@ -137,21 +155,6 @@ A unique id for a user that you want to adjust the credit of. Defaults to the cu
=cut
-sub new {
- my ($class, $session, $userId) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- unless (defined $userId) {
- $userId = $session->user->userId;
- }
- my $self = register $class;
- my $id = id $self;
- $session{ $id } = $session;
- $userId{ $id } = $userId;
- return $self;
-}
-
#-------------------------------------------------------------------
=head2 session ()
diff --git a/lib/WebGUI/Shop/Pay.pm b/lib/WebGUI/Shop/Pay.pm
index e6425bebc..4ebb03cb6 100644
--- a/lib/WebGUI/Shop/Pay.pm
+++ b/lib/WebGUI/Shop/Pay.pm
@@ -16,7 +16,6 @@ package WebGUI::Shop::Pay;
use strict;
-#use Class::InsideOut qw{ :std };
use Moose;
use WebGUI::Exception;
use WebGUI::International;
diff --git a/lib/WebGUI/Shop/Vendor.pm b/lib/WebGUI/Shop/Vendor.pm
index bf9a6d3e6..4584aa601 100644
--- a/lib/WebGUI/Shop/Vendor.pm
+++ b/lib/WebGUI/Shop/Vendor.pm
@@ -1,7 +1,93 @@
package WebGUI::Shop::Vendor;
use strict;
-use Class::InsideOut qw{ :std };
+use Scalar::Util qw/blessed/;
+use Moose;
+use WebGUI::Definition;
+
+property 'name' => (
+ is => 'rw',
+ noFormPost => 1,
+ default => '',
+);
+
+property 'userId' => (
+ is => 'rw',
+ noFormPost => 1,
+ default => '',
+);
+
+property 'url' => (
+ is => 'rw',
+ noFormPost => 1,
+ default => '',
+);
+
+property 'paymentInformation' => (
+ is => 'rw',
+ noFormPost => 1,
+ default => '',
+);
+
+property 'preferredPaymentType' => (
+ is => 'rw',
+ noFormPost => 1,
+ default => '',
+);
+
+has 'dateCreated' => (
+ is => 'ro',
+);
+has [ qw/session vendorId/ ] => (
+ is => 'ro',
+ required => 1,
+);
+
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+ if (ref $_[0] eq 'HASH') {
+ ##Need same db code as below here.
+ ##Session check goes here?
+ ##Build a new one
+ my $properties = $_[0];
+ my $session = $properties->{session};
+ if (! (blessed $session && $session->isa('WebGUI::Session')) ) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ my ($vendorId, $dateCreated) = $class->_init($session);
+ $properties->{vendorId} = $vendorId;
+ $properties->{dateCreated} = $dateCreated;
+ return $class->$orig($properties);
+ }
+ my $session = shift;
+ if (! (blessed $session && $session->isa('WebGUI::Session'))) {
+ WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
+ }
+ my $argument2 = shift;
+ if (!defined $argument2) {
+ WebGUI::Error::InvalidParam->throw( param=>$argument2, error=>"Need a vendorId.");
+ }
+ if (ref $argument2 eq 'HASH') {
+ ##Build a new one
+ my ($vendorId, $dateCreated) = $class->_init($session);
+ my $properties = $argument2;
+ $properties->{session} = $session;
+ $properties->{vendorId} = $vendorId;
+ $properties->{dateCreated} = $dateCreated;
+ return $class->$orig($properties);
+ }
+ else {
+ ##Look up one in the db
+ my $vendor = $session->db->quickHashRef("select * from vendor where vendorId=?", [$argument2]);
+ if ($vendor->{vendorId} eq "") {
+ WebGUI::Error::ObjectNotFound->throw(error=>"Vendor not found.", id=>$argument2);
+ }
+ $vendor->{session} = $session;
+ return $class->$orig($vendor);
+ }
+};
+
use WebGUI::Shop::Admin;
use WebGUI::Exception::Shop;
use WebGUI::International;
@@ -21,7 +107,7 @@ Keeps track of vendors that sell merchandise in the store.
use WebGUI::Shop::Vendor;
- my $vendor = WebGUI::Shop::Vendor->new($session, $vendord);
+ my $vendor = WebGUI::Shop::Vendor->new($session, $vendorId);
=head1 METHODS
@@ -29,35 +115,35 @@ These subroutines are available from this package:
=cut
-readonly session => my %session;
-readonly properties => my %properties;
+#-------------------------------------------------------------------
+
+=head2 _init ( session )
+
+Builds a stub of object information in the database, and returns the newly created
+vendorId, and the dateCreated fields so the object can be initialized correctly.
+
+=cut
+
+sub _init {
+ my $class = shift;
+ my $session = shift;
+ my $vendorId = $session->id->generate;
+ my $dateCreated = WebGUI::DateTime->new($session)->toDatabase;
+ $session->db->write("insert into vendor (vendorId, dateCreated) values (?, ?)",[$vendorId, $dateCreated]);
+ return ($vendorId, $dateCreated);
+}
#-------------------------------------------------------------------
=head2 create ( session, properties )
-Constructor. Creates a new vendor.
-
-=head3 session
-
-A reference to the current session.
-
-=head3 properties
-
-A hash reference containing the properties for this vendor. See update() for details.
+Constructor. Creates a new vendor. Really an alias for WebGUI::Shop::Vendor->new($session, $properties)
=cut
sub create {
my ($class, $session, $properties) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- my $id = $session->id->generate;
- $session->db->write("insert into vendor (vendorId, dateCreated) values (?, now())",[$id]);
- my $self = $class->new($session, $id);
- $self->update($properties);
- return $self;
+ return $class->new($session, $properties);
}
#-------------------------------------------------------------------
@@ -70,51 +156,20 @@ Deletes this vendor.
sub delete {
my ($self) = @_;
- $self->session->db->deleteRow("vendor","vendorId",$self->getId);
-}
-
-#-------------------------------------------------------------------
-
-=head2 get ( [ property ] )
-
-Returns a duplicated hash reference of this objectÕs data. See update() for details.
-
-=head3 property
-
-Any field returns the value of a field rather than the hash reference.
-
-=head3 Additional properties
-
-=head4 dateCreated
-
-The date this vendor was created in the system.
-
-=head4 vendorId
-
-The id of this vendor from the database. Use getId() instead.
-
-=cut
-
-sub get {
- my ($self, $name) = @_;
- if (defined $name) {
- return $properties{id $self}{$name};
- }
- my %copyOfHashRef = %{$properties{id $self}};
- return \%copyOfHashRef;
+ $self->session->db->deleteRow("vendor", "vendorId", $self->vendorId);
}
#-------------------------------------------------------------------
=head2 getId ()
-Returns the unique id of this item.
+Returns the unique id of this item. You should use $self->vendorId instead.
=cut
sub getId {
my $self = shift;
- return $self->get("vendorId");
+ return $self->vendorId;
}
#-------------------------------------------------------------------
@@ -147,7 +202,7 @@ sub getPayoutTotals {
my %totals = $self->session->db->buildHash(
'select vendorPayoutStatus, sum(vendorPayoutAmount) as amount from transactionItem as t1, transaction as t2 '
.'where t1.transactionId = t2.transactionId and t2.isSuccessful <> 0 and vendorId=? group by vendorPayoutStatus ',
- [ $self->getId ]
+ [ $self->vendorId ]
);
# Format the payout categories and calc the total those.
@@ -204,10 +259,10 @@ sub isVendorInfoComplete {
my $self = shift;
my $complete =
- defined $self->get( 'name' )
- && defined $self->get( 'userId' )
- && defined $self->get( 'preferredPaymentType' )
- && defined $self->get( 'paymentInformation' );
+ defined $self->name
+ && defined $self->userId
+ && defined $self->preferredPaymentType
+ && defined $self->paymentInformation;
return $complete
}
@@ -216,7 +271,12 @@ sub isVendorInfoComplete {
=head2 new ( session, vendorId )
-Constructor. Returns a WebGUI::Shop::Vendor object.
+=head2 new ( session, properties )
+
+=head2 new ( hashref )
+
+Constructor. Returns a WebGUI::Shop::Vendor object, either by fetching information from the database,
+or using passed in properties.
=head3 session
@@ -229,26 +289,44 @@ A unique id for a vendor that already exists in the database. If the vendorId i
in, then a WebGUI::Error::InvalidParam Exception will be thrown. If the requested Id cannot
be found in the database, then a WebGUI::Error::ObjectNotFound exception will be thrown.
+=head3 properties
+
+A hashref of properties to assign to the object when it is created.
+
+=head3 hashref
+
+A classic Moose-style hashref of options. It must include a WebGUI::Session object.
+
+=head3 Attributes
+
+=head4 name
+
+The name of the vendor.
+
+=head4 userId
+
+The unique GUID of the vendor.
+
+=head4 url
+
+The vendor's url.
+
+=head4 vendorId
+
+A unique identifier for this vendor. This option may be included in the properties for the new object, but it will
+be ignored.
+
+=head4 dateCreated
+
+The date this vendor was created, in database format. This option may be included in the properties for the new object,
+but it will be ignored.
+
+=head4 paymentInformation
+
+=head4 preferredPaymentType
+
=cut
-sub new {
- my ($class, $session, $vendorId) = @_;
- unless (defined $session && $session->isa("WebGUI::Session")) {
- WebGUI::Error::InvalidObject->throw(expected=>"WebGUI::Session", got=>(ref $session), error=>"Need a session.");
- }
- unless (defined $vendorId) {
- WebGUI::Error::InvalidParam->throw( param=>$vendorId, error=>"Need a vendorId.");
- }
- my $vendor = $session->db->quickHashRef("select * from vendor where vendorId=?",[$vendorId]);
- if ($vendor->{vendorId} eq "") {
- WebGUI::Error::ObjectNotFound->throw(error=>"Vendor not found.", id=>$vendorId);
- }
- my $self = register $class;
- my $id = id $self;
- $session{ $id } = $session;
- $properties{ $id } = $vendor;
- return $self;
-}
#-------------------------------------------------------------------
@@ -262,7 +340,7 @@ A reference to the current session.
=head3 userId
-A unique userId. Will pull from the session if not specified.
+A unique userId. Will pull from the session if not specified.
=cut
@@ -289,44 +367,16 @@ Returns a reference to the current session.
#-------------------------------------------------------------------
-=head2 update ( properties )
+=head2 write ( )
-Sets properties of the vendor
-
-=head3 properties
-
-A hash reference that contains one of the following:
-
-=head4 name
-
-The name of the vendor.
-
-=head4 userId
-
-The unique GUID of the vendor.
-
-=head4 url
-
-The vendor's url.
-
-=head4 paymentInformation
-
-????
-
-=head4 preferredPaymentType
-
-????
+Serializes the object's properties to the database
=cut
-sub update {
- my ($self, $newProperties) = @_;
- my $id = id $self;
- my @fields = (qw(name userId url paymentInformation preferredPaymentType));
- foreach my $field (@fields) {
- $properties{$id}{$field} = (exists $newProperties->{$field}) ? $newProperties->{$field} : $properties{$id}{$field};
- }
- $self->session->db->setRow("vendor","vendorId",$properties{$id});
+sub write {
+ my ($self) = @_;
+ my $properties = $self->get();
+ $self->session->db->setRow("vendor", "vendorId", $properties);
}
#-------------------------------------------------------------------
@@ -447,7 +497,7 @@ sub www_manage {
.WebGUI::Form::formHeader($session, {extras=>'style="float: left;"' })
.WebGUI::Form::hidden($session, { name => "shop", value => "vendor" })
.WebGUI::Form::hidden($session, { name => "method", value => "delete" })
- .WebGUI::Form::hidden($session, { name => "vendorId", value => $vendor->getId })
+ .WebGUI::Form::hidden($session, { name => "vendorId", value => $vendor->vendorId })
.WebGUI::Form::submit($session, { value => $i18n->get("delete"), extras => 'class="backwardButton"' })
.WebGUI::Form::formFooter($session)
@@ -455,12 +505,12 @@ sub www_manage {
.WebGUI::Form::formHeader($session, {extras=>'style="float: left;"' })
.WebGUI::Form::hidden($session, { name => "shop", value => "vendor" })
.WebGUI::Form::hidden($session, { name => "method", value => "edit" })
- .WebGUI::Form::hidden($session, { name => "vendorId", value => $vendor->getId })
+ .WebGUI::Form::hidden($session, { name => "vendorId", value => $vendor->vendorId })
.WebGUI::Form::submit($session, { value => $i18n->get("edit"), extras => 'class="normalButton"' })
.WebGUI::Form::formFooter($session)
# Append name
- .' '. $vendor->get("name")
+ .' '. $vendor->name
.' ![\"The](\"http://image.weather.com/pics/oap/slogo.gif\")
![](\"^Extras(wobject/ProjectManager/close.gif);\")
\r\n ![](\"^Extras(macro/UsersOnline/group-1.gif);\"/)
![](\"^Extras(macro/UsersOnline/members.gif);\"/)
![](\"^Extras(macro/UsersOnline/visitors.gif);\"/)
![](\"^Extras(macro/UsersOnline/total.gif);\"/)
![](\"^Extras(macro/UsersOnline/group-2.gif);\"/)
![\"\"](\"^Extras(wobject/Dashboard/edit_btn.jpg);\")
![\"\"](\"^Extras(wobject/Dashboard/delete_btn.jpg);\")
![\"\"](\"^Extras(wobject/Dashboard/reload.gif);\")