diff --git a/docs/create.sql b/docs/create.sql index c2e82e41e..98648034a 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -10,8 +10,8 @@ CREATE TABLE Article ( widgetId int(11) default NULL, - startDate datetime default NULL, - endDate datetime default NULL, + startDate int(11) default NULL, + endDate int(11) default NULL, body text, image varchar(255) default NULL, linkTitle varchar(255) default NULL, @@ -157,7 +157,7 @@ CREATE TABLE SyndicatedContent ( widgetId int(11) NOT NULL default '0', rssUrl text, content text, - lastFetched datetime NOT NULL default '0000-00-00 00:00:00', + lastFetched int(11) default NULL, PRIMARY KEY (widgetId) ) TYPE=MyISAM; @@ -183,23 +183,6 @@ CREATE TABLE UserSubmission ( # -# -# Table structure for table 'dict' -# - -CREATE TABLE dict ( - url_id int(11) NOT NULL default '0', - word varchar(32) NOT NULL default '', - intag int(11) NOT NULL default '0', - KEY url_id (url_id), - KEY word_url (word) -) TYPE=MyISAM; - -# -# Dumping data for table 'dict' -# - - # # Table structure for table 'event' # @@ -209,8 +192,8 @@ CREATE TABLE event ( widgetId int(11) default NULL, name varchar(255) default NULL, description text, - startDate datetime default NULL, - endDate datetime default NULL, + startDate int(11) default NULL, + endDate int(11) default NULL, PRIMARY KEY (eventId) ) TYPE=MyISAM; @@ -419,7 +402,7 @@ CREATE TABLE message ( username varchar(30) default NULL, subject varchar(255) default NULL, message text, - dateOfPost datetime default NULL, + dateOfPost int(11) default NULL, PRIMARY KEY (messageId) ) TYPE=MyISAM; @@ -496,28 +479,14 @@ CREATE TABLE pollAnswer ( # -# -# Table structure for table 'robots' -# - -CREATE TABLE robots ( - hostinfo varchar(127) NOT NULL default '', - path varchar(127) NOT NULL default '' -) TYPE=MyISAM; - -# -# Dumping data for table 'robots' -# - - # # Table structure for table 'session' # CREATE TABLE session ( sessionId varchar(60) NOT NULL default '', - expires datetime default NULL, - lastPageView datetime default NULL, + expires int(11) default NULL, + lastPageView int(11) default NULL, adminOn int(11) NOT NULL default '0', lastIP varchar(50) default NULL, PRIMARY KEY (sessionId) @@ -527,7 +496,6 @@ CREATE TABLE session ( # Dumping data for table 'session' # -INSERT INTO session VALUES ('3|yJFcoK2pMVyHw','2001-09-16 03:09:06','2001-09-15 19:22:26',1,'10.0.0.20'); # # Table structure for table 'settings' @@ -558,583 +526,6 @@ INSERT INTO settings VALUES ('ldapIdName','LDAP Shortname'); INSERT INTO settings VALUES ('ldapPasswordName','LDAP Password'); INSERT INTO settings VALUES ('authMethod','WebGUI'); -# -# Table structure for table 'stopword' -# - -CREATE TABLE stopword ( - word char(32) NOT NULL default '', - lang char(2) NOT NULL default '', - PRIMARY KEY (word,lang) -) TYPE=MyISAM; - -# -# Dumping data for table 'stopword' -# - -INSERT INTO stopword VALUES ('a','en'); -INSERT INTO stopword VALUES ('about','en'); -INSERT INTO stopword VALUES ('above','en'); -INSERT INTO stopword VALUES ('abst','en'); -INSERT INTO stopword VALUES ('accordance','en'); -INSERT INTO stopword VALUES ('according','en'); -INSERT INTO stopword VALUES ('accordingly','en'); -INSERT INTO stopword VALUES ('across','en'); -INSERT INTO stopword VALUES ('act','en'); -INSERT INTO stopword VALUES ('actually','en'); -INSERT INTO stopword VALUES ('added','en'); -INSERT INTO stopword VALUES ('adj','en'); -INSERT INTO stopword VALUES ('adopted','en'); -INSERT INTO stopword VALUES ('affected','en'); -INSERT INTO stopword VALUES ('affecting','en'); -INSERT INTO stopword VALUES ('affects','en'); -INSERT INTO stopword VALUES ('after','en'); -INSERT INTO stopword VALUES ('afterwards','en'); -INSERT INTO stopword VALUES ('again','en'); -INSERT INTO stopword VALUES ('against','en'); -INSERT INTO stopword VALUES ('ah','en'); -INSERT INTO stopword VALUES ('all','en'); -INSERT INTO stopword VALUES ('almost','en'); -INSERT INTO stopword VALUES ('alone','en'); -INSERT INTO stopword VALUES ('along','en'); -INSERT INTO stopword VALUES ('already','en'); -INSERT INTO stopword VALUES ('also','en'); -INSERT INTO stopword VALUES ('although','en'); -INSERT INTO stopword VALUES ('always','en'); -INSERT INTO stopword VALUES ('am','en'); -INSERT INTO stopword VALUES ('among','en'); -INSERT INTO stopword VALUES ('amongst','en'); -INSERT INTO stopword VALUES ('an','en'); -INSERT INTO stopword VALUES ('and','en'); -INSERT INTO stopword VALUES ('announce','en'); -INSERT INTO stopword VALUES ('another','en'); -INSERT INTO stopword VALUES ('any','en'); -INSERT INTO stopword VALUES ('anyhow','en'); -INSERT INTO stopword VALUES ('anymore','en'); -INSERT INTO stopword VALUES ('anyone','en'); -INSERT INTO stopword VALUES ('anything','en'); -INSERT INTO stopword VALUES ('anywhere','en'); -INSERT INTO stopword VALUES ('apparently','en'); -INSERT INTO stopword VALUES ('approximately','en'); -INSERT INTO stopword VALUES ('are','en'); -INSERT INTO stopword VALUES ('aren','en'); -INSERT INTO stopword VALUES ('arent','en'); -INSERT INTO stopword VALUES ('arise','en'); -INSERT INTO stopword VALUES ('around','en'); -INSERT INTO stopword VALUES ('as','en'); -INSERT INTO stopword VALUES ('aside','en'); -INSERT INTO stopword VALUES ('at','en'); -INSERT INTO stopword VALUES ('auth','en'); -INSERT INTO stopword VALUES ('available','en'); -INSERT INTO stopword VALUES ('away','en'); -INSERT INTO stopword VALUES ('b','en'); -INSERT INTO stopword VALUES ('back','en'); -INSERT INTO stopword VALUES ('be','en'); -INSERT INTO stopword VALUES ('became','en'); -INSERT INTO stopword VALUES ('because','en'); -INSERT INTO stopword VALUES ('become','en'); -INSERT INTO stopword VALUES ('becomes','en'); -INSERT INTO stopword VALUES ('becoming','en'); -INSERT INTO stopword VALUES ('been','en'); -INSERT INTO stopword VALUES ('before','en'); -INSERT INTO stopword VALUES ('beforehand','en'); -INSERT INTO stopword VALUES ('begin','en'); -INSERT INTO stopword VALUES ('beginning','en'); -INSERT INTO stopword VALUES ('beginnings','en'); -INSERT INTO stopword VALUES ('begins','en'); -INSERT INTO stopword VALUES ('behind','en'); -INSERT INTO stopword VALUES ('being','en'); -INSERT INTO stopword VALUES ('below','en'); -INSERT INTO stopword VALUES ('beside','en'); -INSERT INTO stopword VALUES ('besides','en'); -INSERT INTO stopword VALUES ('between','en'); -INSERT INTO stopword VALUES ('beyond','en'); -INSERT INTO stopword VALUES ('billion','en'); -INSERT INTO stopword VALUES ('biol','en'); -INSERT INTO stopword VALUES ('both','en'); -INSERT INTO stopword VALUES ('briefly','en'); -INSERT INTO stopword VALUES ('but','en'); -INSERT INTO stopword VALUES ('by','en'); -INSERT INTO stopword VALUES ('c','en'); -INSERT INTO stopword VALUES ('ca','en'); -INSERT INTO stopword VALUES ('came','en'); -INSERT INTO stopword VALUES ('can','en'); -INSERT INTO stopword VALUES ('cannot','en'); -INSERT INTO stopword VALUES ('cant','en'); -INSERT INTO stopword VALUES ('certain','en'); -INSERT INTO stopword VALUES ('certainly','en'); -INSERT INTO stopword VALUES ('co','en'); -INSERT INTO stopword VALUES ('co.','en'); -INSERT INTO stopword VALUES ('come','en'); -INSERT INTO stopword VALUES ('contains','en'); -INSERT INTO stopword VALUES ('could','en'); -INSERT INTO stopword VALUES ('couldnt','en'); -INSERT INTO stopword VALUES ('d','en'); -INSERT INTO stopword VALUES ('date','en'); -INSERT INTO stopword VALUES ('did','en'); -INSERT INTO stopword VALUES ('didnt','en'); -INSERT INTO stopword VALUES ('different','en'); -INSERT INTO stopword VALUES ('do','en'); -INSERT INTO stopword VALUES ('does','en'); -INSERT INTO stopword VALUES ('doesnt','en'); -INSERT INTO stopword VALUES ('doing','en'); -INSERT INTO stopword VALUES ('done','en'); -INSERT INTO stopword VALUES ('dont','en'); -INSERT INTO stopword VALUES ('down','en'); -INSERT INTO stopword VALUES ('due','en'); -INSERT INTO stopword VALUES ('during','en'); -INSERT INTO stopword VALUES ('e','en'); -INSERT INTO stopword VALUES ('each','en'); -INSERT INTO stopword VALUES ('ed','en'); -INSERT INTO stopword VALUES ('effect','en'); -INSERT INTO stopword VALUES ('eg','en'); -INSERT INTO stopword VALUES ('eight','en'); -INSERT INTO stopword VALUES ('eighty','en'); -INSERT INTO stopword VALUES ('either','en'); -INSERT INTO stopword VALUES ('else','en'); -INSERT INTO stopword VALUES ('elsewhere','en'); -INSERT INTO stopword VALUES ('end','en'); -INSERT INTO stopword VALUES ('ending','en'); -INSERT INTO stopword VALUES ('enough','en'); -INSERT INTO stopword VALUES ('especially','en'); -INSERT INTO stopword VALUES ('et-al','en'); -INSERT INTO stopword VALUES ('etc','en'); -INSERT INTO stopword VALUES ('even','en'); -INSERT INTO stopword VALUES ('ever','en'); -INSERT INTO stopword VALUES ('every','en'); -INSERT INTO stopword VALUES ('everyone','en'); -INSERT INTO stopword VALUES ('everything','en'); -INSERT INTO stopword VALUES ('everywhere','en'); -INSERT INTO stopword VALUES ('except','en'); -INSERT INTO stopword VALUES ('f','en'); -INSERT INTO stopword VALUES ('far','en'); -INSERT INTO stopword VALUES ('few','en'); -INSERT INTO stopword VALUES ('ff','en'); -INSERT INTO stopword VALUES ('first','en'); -INSERT INTO stopword VALUES ('five','en'); -INSERT INTO stopword VALUES ('fix','en'); -INSERT INTO stopword VALUES ('followed','en'); -INSERT INTO stopword VALUES ('following','en'); -INSERT INTO stopword VALUES ('for','en'); -INSERT INTO stopword VALUES ('former','en'); -INSERT INTO stopword VALUES ('formerly','en'); -INSERT INTO stopword VALUES ('found','en'); -INSERT INTO stopword VALUES ('from','en'); -INSERT INTO stopword VALUES ('further','en'); -INSERT INTO stopword VALUES ('g','en'); -INSERT INTO stopword VALUES ('gave','en'); -INSERT INTO stopword VALUES ('get','en'); -INSERT INTO stopword VALUES ('gets','en'); -INSERT INTO stopword VALUES ('give','en'); -INSERT INTO stopword VALUES ('given','en'); -INSERT INTO stopword VALUES ('giving','en'); -INSERT INTO stopword VALUES ('go','en'); -INSERT INTO stopword VALUES ('goes','en'); -INSERT INTO stopword VALUES ('gone','en'); -INSERT INTO stopword VALUES ('got','en'); -INSERT INTO stopword VALUES ('h','en'); -INSERT INTO stopword VALUES ('had','en'); -INSERT INTO stopword VALUES ('hardly','en'); -INSERT INTO stopword VALUES ('has','en'); -INSERT INTO stopword VALUES ('hasnt','en'); -INSERT INTO stopword VALUES ('have','en'); -INSERT INTO stopword VALUES ('havent','en'); -INSERT INTO stopword VALUES ('having','en'); -INSERT INTO stopword VALUES ('he','en'); -INSERT INTO stopword VALUES ('hed','en'); -INSERT INTO stopword VALUES ('hence','en'); -INSERT INTO stopword VALUES ('her','en'); -INSERT INTO stopword VALUES ('here','en'); -INSERT INTO stopword VALUES ('hereafter','en'); -INSERT INTO stopword VALUES ('hereby','en'); -INSERT INTO stopword VALUES ('herein','en'); -INSERT INTO stopword VALUES ('heres','en'); -INSERT INTO stopword VALUES ('hereupon','en'); -INSERT INTO stopword VALUES ('hers','en'); -INSERT INTO stopword VALUES ('herself','en'); -INSERT INTO stopword VALUES ('hes','en'); -INSERT INTO stopword VALUES ('hid','en'); -INSERT INTO stopword VALUES ('him','en'); -INSERT INTO stopword VALUES ('himself','en'); -INSERT INTO stopword VALUES ('his','en'); -INSERT INTO stopword VALUES ('home','en'); -INSERT INTO stopword VALUES ('how','en'); -INSERT INTO stopword VALUES ('however','en'); -INSERT INTO stopword VALUES ('hundred','en'); -INSERT INTO stopword VALUES ('i','en'); -INSERT INTO stopword VALUES ('id','en'); -INSERT INTO stopword VALUES ('ie','en'); -INSERT INTO stopword VALUES ('if','en'); -INSERT INTO stopword VALUES ('ill','en'); -INSERT INTO stopword VALUES ('im','en'); -INSERT INTO stopword VALUES ('immediately','en'); -INSERT INTO stopword VALUES ('importance','en'); -INSERT INTO stopword VALUES ('important','en'); -INSERT INTO stopword VALUES ('in','en'); -INSERT INTO stopword VALUES ('inc','en'); -INSERT INTO stopword VALUES ('inc.','en'); -INSERT INTO stopword VALUES ('indeed','en'); -INSERT INTO stopword VALUES ('index','en'); -INSERT INTO stopword VALUES ('information','en'); -INSERT INTO stopword VALUES ('instead','en'); -INSERT INTO stopword VALUES ('into','en'); -INSERT INTO stopword VALUES ('invention','en'); -INSERT INTO stopword VALUES ('is','en'); -INSERT INTO stopword VALUES ('isnt','en'); -INSERT INTO stopword VALUES ('it','en'); -INSERT INTO stopword VALUES ('its','en'); -INSERT INTO stopword VALUES ('itself','en'); -INSERT INTO stopword VALUES ('ive','en'); -INSERT INTO stopword VALUES ('j','en'); -INSERT INTO stopword VALUES ('just','en'); -INSERT INTO stopword VALUES ('k','en'); -INSERT INTO stopword VALUES ('keep','en'); -INSERT INTO stopword VALUES ('kept','en'); -INSERT INTO stopword VALUES ('keys','en'); -INSERT INTO stopword VALUES ('kg','en'); -INSERT INTO stopword VALUES ('km','en'); -INSERT INTO stopword VALUES ('l','en'); -INSERT INTO stopword VALUES ('largely','en'); -INSERT INTO stopword VALUES ('last','en'); -INSERT INTO stopword VALUES ('later','en'); -INSERT INTO stopword VALUES ('latter','en'); -INSERT INTO stopword VALUES ('latterly','en'); -INSERT INTO stopword VALUES ('least','en'); -INSERT INTO stopword VALUES ('let','en'); -INSERT INTO stopword VALUES ('lets','en'); -INSERT INTO stopword VALUES ('like','en'); -INSERT INTO stopword VALUES ('likely','en'); -INSERT INTO stopword VALUES ('line','en'); -INSERT INTO stopword VALUES ('ll','en'); -INSERT INTO stopword VALUES ('ltd','en'); -INSERT INTO stopword VALUES ('m','en'); -INSERT INTO stopword VALUES ('made','en'); -INSERT INTO stopword VALUES ('mainly','en'); -INSERT INTO stopword VALUES ('make','en'); -INSERT INTO stopword VALUES ('makes','en'); -INSERT INTO stopword VALUES ('many','en'); -INSERT INTO stopword VALUES ('may','en'); -INSERT INTO stopword VALUES ('maybe','en'); -INSERT INTO stopword VALUES ('me','en'); -INSERT INTO stopword VALUES ('means','en'); -INSERT INTO stopword VALUES ('meantime','en'); -INSERT INTO stopword VALUES ('meanwhile','en'); -INSERT INTO stopword VALUES ('mg','en'); -INSERT INTO stopword VALUES ('might','en'); -INSERT INTO stopword VALUES ('million','en'); -INSERT INTO stopword VALUES ('miss','en'); -INSERT INTO stopword VALUES ('ml','en'); -INSERT INTO stopword VALUES ('more','en'); -INSERT INTO stopword VALUES ('moreover','en'); -INSERT INTO stopword VALUES ('most','en'); -INSERT INTO stopword VALUES ('mostly','en'); -INSERT INTO stopword VALUES ('mr','en'); -INSERT INTO stopword VALUES ('mrs','en'); -INSERT INTO stopword VALUES ('much','en'); -INSERT INTO stopword VALUES ('mug','en'); -INSERT INTO stopword VALUES ('must','en'); -INSERT INTO stopword VALUES ('my','en'); -INSERT INTO stopword VALUES ('myself','en'); -INSERT INTO stopword VALUES ('n','en'); -INSERT INTO stopword VALUES ('na','en'); -INSERT INTO stopword VALUES ('namely','en'); -INSERT INTO stopword VALUES ('nay','en'); -INSERT INTO stopword VALUES ('near','en'); -INSERT INTO stopword VALUES ('nearly','en'); -INSERT INTO stopword VALUES ('necessarily','en'); -INSERT INTO stopword VALUES ('neither','en'); -INSERT INTO stopword VALUES ('never','en'); -INSERT INTO stopword VALUES ('nevertheless','en'); -INSERT INTO stopword VALUES ('new','en'); -INSERT INTO stopword VALUES ('next','en'); -INSERT INTO stopword VALUES ('nine','en'); -INSERT INTO stopword VALUES ('ninety','en'); -INSERT INTO stopword VALUES ('no','en'); -INSERT INTO stopword VALUES ('nobody','en'); -INSERT INTO stopword VALUES ('none','en'); -INSERT INTO stopword VALUES ('nonetheless','en'); -INSERT INTO stopword VALUES ('noone','en'); -INSERT INTO stopword VALUES ('nor','en'); -INSERT INTO stopword VALUES ('normally','en'); -INSERT INTO stopword VALUES ('nos','en'); -INSERT INTO stopword VALUES ('not','en'); -INSERT INTO stopword VALUES ('noted','en'); -INSERT INTO stopword VALUES ('nothing','en'); -INSERT INTO stopword VALUES ('now','en'); -INSERT INTO stopword VALUES ('nowhere','en'); -INSERT INTO stopword VALUES ('o','en'); -INSERT INTO stopword VALUES ('obtain','en'); -INSERT INTO stopword VALUES ('obtained','en'); -INSERT INTO stopword VALUES ('of','en'); -INSERT INTO stopword VALUES ('off','en'); -INSERT INTO stopword VALUES ('often','en'); -INSERT INTO stopword VALUES ('oh','en'); -INSERT INTO stopword VALUES ('omitted','en'); -INSERT INTO stopword VALUES ('on','en'); -INSERT INTO stopword VALUES ('once','en'); -INSERT INTO stopword VALUES ('one','en'); -INSERT INTO stopword VALUES ('ones','en'); -INSERT INTO stopword VALUES ('only','en'); -INSERT INTO stopword VALUES ('onto','en'); -INSERT INTO stopword VALUES ('or','en'); -INSERT INTO stopword VALUES ('ord','en'); -INSERT INTO stopword VALUES ('other','en'); -INSERT INTO stopword VALUES ('others','en'); -INSERT INTO stopword VALUES ('otherwise','en'); -INSERT INTO stopword VALUES ('ought','en'); -INSERT INTO stopword VALUES ('our','en'); -INSERT INTO stopword VALUES ('ours','en'); -INSERT INTO stopword VALUES ('ourselves','en'); -INSERT INTO stopword VALUES ('out','en'); -INSERT INTO stopword VALUES ('over','en'); -INSERT INTO stopword VALUES ('overall','en'); -INSERT INTO stopword VALUES ('owing','en'); -INSERT INTO stopword VALUES ('own','en'); -INSERT INTO stopword VALUES ('p','en'); -INSERT INTO stopword VALUES ('page','en'); -INSERT INTO stopword VALUES ('pages','en'); -INSERT INTO stopword VALUES ('part','en'); -INSERT INTO stopword VALUES ('particularly','en'); -INSERT INTO stopword VALUES ('past','en'); -INSERT INTO stopword VALUES ('per','en'); -INSERT INTO stopword VALUES ('perhaps','en'); -INSERT INTO stopword VALUES ('please','en'); -INSERT INTO stopword VALUES ('poorly','en'); -INSERT INTO stopword VALUES ('possible','en'); -INSERT INTO stopword VALUES ('possibly','en'); -INSERT INTO stopword VALUES ('potentially','en'); -INSERT INTO stopword VALUES ('pp','en'); -INSERT INTO stopword VALUES ('predominantly','en'); -INSERT INTO stopword VALUES ('present','en'); -INSERT INTO stopword VALUES ('previously','en'); -INSERT INTO stopword VALUES ('primarily','en'); -INSERT INTO stopword VALUES ('probably','en'); -INSERT INTO stopword VALUES ('promptly','en'); -INSERT INTO stopword VALUES ('proud','en'); -INSERT INTO stopword VALUES ('put','en'); -INSERT INTO stopword VALUES ('q','en'); -INSERT INTO stopword VALUES ('quickly','en'); -INSERT INTO stopword VALUES ('quite','en'); -INSERT INTO stopword VALUES ('r','en'); -INSERT INTO stopword VALUES ('ran','en'); -INSERT INTO stopword VALUES ('rather','en'); -INSERT INTO stopword VALUES ('re','en'); -INSERT INTO stopword VALUES ('readily','en'); -INSERT INTO stopword VALUES ('really','en'); -INSERT INTO stopword VALUES ('recent','en'); -INSERT INTO stopword VALUES ('recently','en'); -INSERT INTO stopword VALUES ('ref','en'); -INSERT INTO stopword VALUES ('refs','en'); -INSERT INTO stopword VALUES ('regardless','en'); -INSERT INTO stopword VALUES ('related','en'); -INSERT INTO stopword VALUES ('relatively','en'); -INSERT INTO stopword VALUES ('research','en'); -INSERT INTO stopword VALUES ('respectively','en'); -INSERT INTO stopword VALUES ('resulted','en'); -INSERT INTO stopword VALUES ('resulting','en'); -INSERT INTO stopword VALUES ('results','en'); -INSERT INTO stopword VALUES ('run','en'); -INSERT INTO stopword VALUES ('s','en'); -INSERT INTO stopword VALUES ('said','en'); -INSERT INTO stopword VALUES ('same','en'); -INSERT INTO stopword VALUES ('say','en'); -INSERT INTO stopword VALUES ('sec','en'); -INSERT INTO stopword VALUES ('section','en'); -INSERT INTO stopword VALUES ('seem','en'); -INSERT INTO stopword VALUES ('seemed','en'); -INSERT INTO stopword VALUES ('seeming','en'); -INSERT INTO stopword VALUES ('seems','en'); -INSERT INTO stopword VALUES ('seen','en'); -INSERT INTO stopword VALUES ('seven','en'); -INSERT INTO stopword VALUES ('several','en'); -INSERT INTO stopword VALUES ('shall','en'); -INSERT INTO stopword VALUES ('she','en'); -INSERT INTO stopword VALUES ('shed','en'); -INSERT INTO stopword VALUES ('shell','en'); -INSERT INTO stopword VALUES ('shes','en'); -INSERT INTO stopword VALUES ('should','en'); -INSERT INTO stopword VALUES ('shouldnt','en'); -INSERT INTO stopword VALUES ('show','en'); -INSERT INTO stopword VALUES ('showed','en'); -INSERT INTO stopword VALUES ('shown','en'); -INSERT INTO stopword VALUES ('showns','en'); -INSERT INTO stopword VALUES ('shows','en'); -INSERT INTO stopword VALUES ('significant','en'); -INSERT INTO stopword VALUES ('significantly','en'); -INSERT INTO stopword VALUES ('similar','en'); -INSERT INTO stopword VALUES ('similarly','en'); -INSERT INTO stopword VALUES ('since','en'); -INSERT INTO stopword VALUES ('six','en'); -INSERT INTO stopword VALUES ('slightly','en'); -INSERT INTO stopword VALUES ('so','en'); -INSERT INTO stopword VALUES ('some','en'); -INSERT INTO stopword VALUES ('somehow','en'); -INSERT INTO stopword VALUES ('someone','en'); -INSERT INTO stopword VALUES ('somethan','en'); -INSERT INTO stopword VALUES ('something','en'); -INSERT INTO stopword VALUES ('sometime','en'); -INSERT INTO stopword VALUES ('sometimes','en'); -INSERT INTO stopword VALUES ('somewhat','en'); -INSERT INTO stopword VALUES ('somewhere','en'); -INSERT INTO stopword VALUES ('soon','en'); -INSERT INTO stopword VALUES ('specifically','en'); -INSERT INTO stopword VALUES ('state','en'); -INSERT INTO stopword VALUES ('states','en'); -INSERT INTO stopword VALUES ('still','en'); -INSERT INTO stopword VALUES ('stop','en'); -INSERT INTO stopword VALUES ('strongly','en'); -INSERT INTO stopword VALUES ('substantially','en'); -INSERT INTO stopword VALUES ('successfully','en'); -INSERT INTO stopword VALUES ('such','en'); -INSERT INTO stopword VALUES ('sufficiently','en'); -INSERT INTO stopword VALUES ('suggest','en'); -INSERT INTO stopword VALUES ('t','en'); -INSERT INTO stopword VALUES ('taking','en'); -INSERT INTO stopword VALUES ('than','en'); -INSERT INTO stopword VALUES ('that','en'); -INSERT INTO stopword VALUES ('thatll','en'); -INSERT INTO stopword VALUES ('thats','en'); -INSERT INTO stopword VALUES ('thatve','en'); -INSERT INTO stopword VALUES ('the','en'); -INSERT INTO stopword VALUES ('their','en'); -INSERT INTO stopword VALUES ('theirs','en'); -INSERT INTO stopword VALUES ('them','en'); -INSERT INTO stopword VALUES ('themselves','en'); -INSERT INTO stopword VALUES ('then','en'); -INSERT INTO stopword VALUES ('thence','en'); -INSERT INTO stopword VALUES ('there','en'); -INSERT INTO stopword VALUES ('thereafter','en'); -INSERT INTO stopword VALUES ('thereby','en'); -INSERT INTO stopword VALUES ('thered','en'); -INSERT INTO stopword VALUES ('therefore','en'); -INSERT INTO stopword VALUES ('therein','en'); -INSERT INTO stopword VALUES ('therell','en'); -INSERT INTO stopword VALUES ('thereof','en'); -INSERT INTO stopword VALUES ('therere','en'); -INSERT INTO stopword VALUES ('theres','en'); -INSERT INTO stopword VALUES ('thereto','en'); -INSERT INTO stopword VALUES ('thereupon','en'); -INSERT INTO stopword VALUES ('thereve','en'); -INSERT INTO stopword VALUES ('these','en'); -INSERT INTO stopword VALUES ('they','en'); -INSERT INTO stopword VALUES ('theyd','en'); -INSERT INTO stopword VALUES ('theyll','en'); -INSERT INTO stopword VALUES ('theyre','en'); -INSERT INTO stopword VALUES ('theyve','en'); -INSERT INTO stopword VALUES ('this','en'); -INSERT INTO stopword VALUES ('those','en'); -INSERT INTO stopword VALUES ('thou','en'); -INSERT INTO stopword VALUES ('though','en'); -INSERT INTO stopword VALUES ('thoughh','en'); -INSERT INTO stopword VALUES ('thousand','en'); -INSERT INTO stopword VALUES ('throug','en'); -INSERT INTO stopword VALUES ('through','en'); -INSERT INTO stopword VALUES ('throughout','en'); -INSERT INTO stopword VALUES ('thru','en'); -INSERT INTO stopword VALUES ('thus','en'); -INSERT INTO stopword VALUES ('til','en'); -INSERT INTO stopword VALUES ('tip','en'); -INSERT INTO stopword VALUES ('to','en'); -INSERT INTO stopword VALUES ('together','en'); -INSERT INTO stopword VALUES ('too','en'); -INSERT INTO stopword VALUES ('toward','en'); -INSERT INTO stopword VALUES ('towards','en'); -INSERT INTO stopword VALUES ('trillion','en'); -INSERT INTO stopword VALUES ('try','en'); -INSERT INTO stopword VALUES ('two','en'); -INSERT INTO stopword VALUES ('u','en'); -INSERT INTO stopword VALUES ('under','en'); -INSERT INTO stopword VALUES ('unless','en'); -INSERT INTO stopword VALUES ('unlike','en'); -INSERT INTO stopword VALUES ('unlikely','en'); -INSERT INTO stopword VALUES ('until','en'); -INSERT INTO stopword VALUES ('unto','en'); -INSERT INTO stopword VALUES ('up','en'); -INSERT INTO stopword VALUES ('upon','en'); -INSERT INTO stopword VALUES ('ups','en'); -INSERT INTO stopword VALUES ('us','en'); -INSERT INTO stopword VALUES ('use','en'); -INSERT INTO stopword VALUES ('used','en'); -INSERT INTO stopword VALUES ('usefully','en'); -INSERT INTO stopword VALUES ('usefulness','en'); -INSERT INTO stopword VALUES ('using','en'); -INSERT INTO stopword VALUES ('usually','en'); -INSERT INTO stopword VALUES ('v','en'); -INSERT INTO stopword VALUES ('various','en'); -INSERT INTO stopword VALUES ('ve','en'); -INSERT INTO stopword VALUES ('very','en'); -INSERT INTO stopword VALUES ('via','en'); -INSERT INTO stopword VALUES ('vol','en'); -INSERT INTO stopword VALUES ('vols','en'); -INSERT INTO stopword VALUES ('vs','en'); -INSERT INTO stopword VALUES ('w','en'); -INSERT INTO stopword VALUES ('was','en'); -INSERT INTO stopword VALUES ('wasnt','en'); -INSERT INTO stopword VALUES ('way','en'); -INSERT INTO stopword VALUES ('we','en'); -INSERT INTO stopword VALUES ('web','en'); -INSERT INTO stopword VALUES ('wed','en'); -INSERT INTO stopword VALUES ('well','en'); -INSERT INTO stopword VALUES ('were','en'); -INSERT INTO stopword VALUES ('werent','en'); -INSERT INTO stopword VALUES ('weve','en'); -INSERT INTO stopword VALUES ('what','en'); -INSERT INTO stopword VALUES ('whatever','en'); -INSERT INTO stopword VALUES ('whatll','en'); -INSERT INTO stopword VALUES ('whats','en'); -INSERT INTO stopword VALUES ('whatve','en'); -INSERT INTO stopword VALUES ('when','en'); -INSERT INTO stopword VALUES ('whence','en'); -INSERT INTO stopword VALUES ('whenever','en'); -INSERT INTO stopword VALUES ('where','en'); -INSERT INTO stopword VALUES ('whereafter','en'); -INSERT INTO stopword VALUES ('whereas','en'); -INSERT INTO stopword VALUES ('whereby','en'); -INSERT INTO stopword VALUES ('wherein','en'); -INSERT INTO stopword VALUES ('wheres','en'); -INSERT INTO stopword VALUES ('whereupon','en'); -INSERT INTO stopword VALUES ('wherever','en'); -INSERT INTO stopword VALUES ('whether','en'); -INSERT INTO stopword VALUES ('which','en'); -INSERT INTO stopword VALUES ('while','en'); -INSERT INTO stopword VALUES ('whim','en'); -INSERT INTO stopword VALUES ('whither','en'); -INSERT INTO stopword VALUES ('who','en'); -INSERT INTO stopword VALUES ('whod','en'); -INSERT INTO stopword VALUES ('whoever','en'); -INSERT INTO stopword VALUES ('whole','en'); -INSERT INTO stopword VALUES ('wholl','en'); -INSERT INTO stopword VALUES ('whom','en'); -INSERT INTO stopword VALUES ('whomever','en'); -INSERT INTO stopword VALUES ('whos','en'); -INSERT INTO stopword VALUES ('whose','en'); -INSERT INTO stopword VALUES ('why','en'); -INSERT INTO stopword VALUES ('widely','en'); -INSERT INTO stopword VALUES ('will','en'); -INSERT INTO stopword VALUES ('with','en'); -INSERT INTO stopword VALUES ('within','en'); -INSERT INTO stopword VALUES ('without','en'); -INSERT INTO stopword VALUES ('wont','en'); -INSERT INTO stopword VALUES ('words','en'); -INSERT INTO stopword VALUES ('world','en'); -INSERT INTO stopword VALUES ('would','en'); -INSERT INTO stopword VALUES ('wouldnt','en'); -INSERT INTO stopword VALUES ('www','en'); -INSERT INTO stopword VALUES ('x','en'); -INSERT INTO stopword VALUES ('y','en'); -INSERT INTO stopword VALUES ('yes','en'); -INSERT INTO stopword VALUES ('yet','en'); -INSERT INTO stopword VALUES ('you','en'); -INSERT INTO stopword VALUES ('youd','en'); -INSERT INTO stopword VALUES ('youll','en'); -INSERT INTO stopword VALUES ('your','en'); -INSERT INTO stopword VALUES ('youre','en'); -INSERT INTO stopword VALUES ('yours','en'); -INSERT INTO stopword VALUES ('yourself','en'); -INSERT INTO stopword VALUES ('yourselves','en'); -INSERT INTO stopword VALUES ('youve','en'); -INSERT INTO stopword VALUES ('z','en'); - # # Table structure for table 'style' # @@ -1186,7 +577,7 @@ CREATE TABLE submission ( widgetId int(11) default NULL, submissionId int(11) NOT NULL default '0', title varchar(30) default NULL, - dateSubmitted datetime default NULL, + dateSubmitted int(11) default NULL, username varchar(30) default NULL, userId int(11) default NULL, content text, @@ -1203,43 +594,10 @@ CREATE TABLE submission ( # -# Table structure for table 'url' +# Table structure for table 'users' # -CREATE TABLE url ( - rec_id int(11) NOT NULL auto_increment, - status int(11) NOT NULL default '0', - url varchar(128) NOT NULL default '', - content_type varchar(48) NOT NULL default '', - title varchar(128) NOT NULL default '', - txt varchar(255) NOT NULL default '', - docsize int(11) NOT NULL default '0', - last_index_time int(11) NOT NULL default '0', - next_index_time int(11) NOT NULL default '0', - last_mod_time int(11) NOT NULL default '0', - referrer int(11) NOT NULL default '0', - tag varchar(11) NOT NULL default '0', - hops int(11) NOT NULL default '0', - category varchar(11) NOT NULL default '', - keywords varchar(255) NOT NULL default '', - description varchar(100) NOT NULL default '', - crc32 int(11) NOT NULL default '0', - lang char(2) NOT NULL default '', - PRIMARY KEY (rec_id), - UNIQUE KEY url (url), - KEY key_crc (crc32) -) TYPE=MyISAM; - -# -# Dumping data for table 'url' -# - - -# -# Table structure for table 'user' -# - -CREATE TABLE user ( +CREATE TABLE users ( userId int(11) NOT NULL default '0', username varchar(35) default NULL, identifier varchar(35) default NULL, @@ -1252,34 +610,34 @@ CREATE TABLE user ( ) TYPE=MyISAM; # -# Dumping data for table 'user' +# Dumping data for table 'users' # -INSERT INTO user VALUES (1,'Visitor','No Login','','','WebGUI',NULL,NULL); -INSERT INTO user VALUES (2,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (3,'Admin','RvlMjeFPs2aAhQdo/xt/Kg','','','WebGUI',NULL,NULL); -INSERT INTO user VALUES (4,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (5,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (6,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (7,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (8,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (9,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (10,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (11,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (12,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (13,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (14,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (15,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (16,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (17,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (18,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (19,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (20,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (21,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (22,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (23,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (24,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); -INSERT INTO user VALUES (25,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (1,'Visitor','No Login','','','WebGUI',NULL,NULL); +INSERT INTO users VALUES (2,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (3,'Admin','RvlMjeFPs2aAhQdo/xt/Kg','','','WebGUI',NULL,NULL); +INSERT INTO users VALUES (4,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (5,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (6,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (7,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (8,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (9,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (10,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (11,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (12,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (13,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (14,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (15,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (16,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (17,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (18,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (19,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (20,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (21,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (22,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (23,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (24,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO users VALUES (25,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); # # Table structure for table 'widget' @@ -1294,9 +652,9 @@ CREATE TABLE widget ( displayTitle int(11) NOT NULL default '1', description text, processMacros int(11) NOT NULL default '0', - dateAdded datetime default NULL, + dateAdded int(11) default NULL, addedBy int(11) default NULL, - lastEdited datetime default NULL, + lastEdited int(11) default NULL, editedBy int(11) default NULL, PRIMARY KEY (widgetId) ) TYPE=MyISAM; diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index 24ac5d948..c2e82e41e 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -319,14 +319,14 @@ INSERT INTO help VALUES (1,'US English','Add','Page','Think of pages as containe INSERT INTO help VALUES (2,'US English','Edit','Page','Title\r\nSee Add Page for details.\r\n\r\nMeta Tags\r\nSee Add Page for details.\r\n\r\nStyle\r\nBy default, when you create a page, it inherits a few traits from its parent. One of those traits is style. Choose from the list of styles if you would like to change the appearance of this page. See Add Style for more details.\r\n\r\nIf you check the box next to the style pull-down menu, all of the pages below this page will take on the style you\'ve chosen for this page.\r\n\r\nPage URL\r\nWhen you create a page a url for the page is generated based on the page title. If you are unhappy with the url that was chosen, you can change it here.\r\n\r\nOwner\r\nThe owner of a page is usually the person who created the page. If you\'d like to give ownership of a page to a different content manager, then change the name here. Be careful though, once you change ownership of the page, you won\'t be able to get it back unless you are an administrator.\r\n\r\nOwner can view?\r\nCan the owner view the page or not?\r\n\r\nOwner can edit?\r\nCan the owner edit the page or not? Be careful, if you decide that the owner cannot edit the page and you do not belong to the page group, then you\'ll lose the ability to edit this page.\r\n\r\nGroup\r\nA group is assigned to every page for additional privilege control. Pick a group from the pull-down menu.\r\n\r\nGroup can view?\r\nCan members of this group view this page?\r\n\r\nGroup can edit?\r\nCan members of this group edit this page?\r\n\r\nAnybody can view?\r\nCan any visitor or member regardless of the group and owner view this page?\r\n\r\nAnybody can edit?\r\nCan any visitor or member regardless of the group and owner edit this page?\r\n\r\n','9'); INSERT INTO help VALUES (3,'US English','Delete','Page','Deleting a page can create a big mess if you are uncertain about what you are doing. When you delete a page you are also deleting the content it contains, all sub-pages connected to this page, and all the content they contain. Be certain that you have already moved all the content you wish to keep before you delete a page.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); INSERT INTO help VALUES (4,'US English','Delete','Style','When you delete a style all pages using that style will be reverted to the fail safe (default) style. To ensure uninterrupted viewing, you should be sure that no pages are using a style before you delete it.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (5,'US English','Add','User','See Manage Users for additional details.\r\n\r\nUsername\r\nUsername is a unique identifier for a user. Sometimes called a handle, it is also how the user will be known on the site. (Note: Administrators have unlimited power in the WebGUI system. This also means they are capable of breaking the system. If you rename or create a user, be careful not to use a username already in existance.)\r\n\r\nPassword\r\nA password is used to ensure that the user is who s/he says s/he is.\r\n\r\nEmail Address\r\nThe user\'s email address. This must only be specified if the user will partake in functions that require email.\r\n\r\nICQ UIN\r\nThe ICQ UIN is the \"User ID Number\" on the ICQ network. ICQ is a very popular instant messaging platform.\r\n\r\nGroups\r\nGroups displays which groups the user is in. Groups that are highlighted are groups that the user is assigned to. Those that are not highlighted are other groups that can be assigned. Note that you must hold down CTRL to select multiple groups.','0'); -INSERT INTO help VALUES (6,'US English','Edit','User','Username\r\nSee Add User for details.\r\n\r\nPassword\r\nSee Add User for details.\r\n\r\nEmail Address\r\nSee Add User for details.\r\n\r\nICQ UIN\r\nSee Add User for details.\r\n\r\nGroups\r\nSee Add User for details.\r\n\r\n','0'); +INSERT INTO help VALUES (5,'US English','Add','User','See Manage Users for additional details.\r\n\r\nUsername\r\nUsername is a unique identifier for a user. Sometimes called a handle, it is also how the user will be known on the site. (Note: Administrators have unlimited power in the WebGUI system. This also means they are capable of breaking the system. If you rename or create a user, be careful not to use a username already in existance.)\r\n\r\nPassword\r\nA password is used to ensure that the user is who s/he says s/he is.\r\n\r\nAuthentication Method\r\nSee Edit Settings for details.\r\n\r\nLDAP URL\r\nSee Edit Settings for details.\r\n\r\nConnect DN\r\nThe Connect DN is the cn (or common name) of a given user in your LDAP database. It should be specified as cn=John Doe. This is, in effect, the username that will be used to authenticate this user against your LDAP server.\r\n\r\nEmail Address\r\nThe user\'s email address. This must only be specified if the user will partake in functions that require email.\r\n\r\nICQ UIN\r\nThe ICQ UIN is the \"User ID Number\" on the ICQ network. ICQ is a very popular instant messaging platform.\r\n\r\nGroups\r\nGroups displays which groups the user is in. Groups that are highlighted are groups that the user is assigned to. Those that are not highlighted are other groups that can be assigned. Note that you must hold down CTRL to select multiple groups.','0'); +INSERT INTO help VALUES (6,'US English','Edit','User','Username\r\nSee Add User for details.\r\n\r\nPassword\r\nSee Add User for details.\r\n\r\nAuthentication Method\r\nSee Edit Settings for details.\r\n\r\nLDAP URL\r\nSee Edit Settings for details.\r\n\r\nConnect DN\r\nSee Add User for details.\r\n\r\nEmail Address\r\nSee Add User for details.\r\n\r\nICQ UIN\r\nSee Add User for details.\r\n\r\nGroups\r\nSee Add User for details.\r\n\r\n','12'); INSERT INTO help VALUES (7,'US English','Delete','User','There is no need to ever actually delete a user. If you are concerned with locking out a user, then simply change their password. If you truely wish to delete a user, then please keep in mind that there are consequences. If you delete a user any content that they added to the site via widgets (like message boards and user contributions) will remain on the site. However, if another user tries to visit the deleted user\'s profile they will get an error message. Also if the user ever is welcomed back to the site, there is no way to give him/her access to his/her old content items except by re-adding the user to the users table manually.\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); INSERT INTO help VALUES (8,'US English','Manage','User','Users are the accounts in the system that are given rights to do certain things. There are two default users built into the system: Admin and Visitor.\r\n\r\nAdmin\r\nAdmin is exactly what you\'d expect. It is a user with unlimited rights in the WebGUI environment. If it can be done, this user has the rights to do it.\r\n\r\nVisitor\r\nVisitor is exactly the opposite of Admin. Visitor has no rights what-so-ever. By default any user who is not logged in is seen as the user Visitor.','0'); INSERT INTO help VALUES (9,'US English','Manage','Style','Styles are used to manage the look and feel of your WebGUI pages. With WebGUI, you can have an unlimited number of styles, so your site can take on as many looks as you like. You could have some pages that look like your company\'s brochure, and some pages that look like Yahoo!®. You could even have some pages that look like pages in a book. Using style management, you have ultimate control over all your designs.\r\n\r\nThere are three styles built in to WebGUI: Fail Safe, Plain Black Software, and Yahoo!®. These styles are not meant to be edited, but rather to give you samples of what\'s possible.\r\n\r\nFail Safe\r\nWhen you delete a style that is still in use on some pages, the Fail Safe style will be applied to those pages. This style has a white background and simple navigation.\r\n\r\nPlain Black Software\r\nThis is the simple design used on the Plain Black Software site.\r\n\r\nYahoo!®\r\nThis is the design of the Yahoo!® site. (Yahoo!® has not given us permission to use their design. It is simply an example.)','0'); INSERT INTO help VALUES (10,'US English','Manage','Group','Groups are used to subdivide privileges and responsibilities within the WebGUI system. For instance, you may be building a site for a classroom situation. In that case you might set up a different group for each class that you teach. You would then apply those groups to the pages that are designed for each class.\r\n\r\nThere are four groups built into WebGUI. They are Admins, Content Managers, Visitors, and Registered Users.\r\n\r\nAdmins\r\nAdmins are users who have unlimited privileges within WebGUI. A user should only be added to the admin group if they oversee the system. Usually only one to three people will be added to this group.\r\n\r\nContent Managers\r\nContent managers are users who have privileges to add, edit, and delete content from various areas on the site. The content managers group should not be used to control individual content areas within the site, but to determine whether a user can edit content at all. You should set up additional groups to separate content areas on the site.\r\n\r\nRegistered Users\r\nWhen users are added to the system they are put into the registered users group. A user should only be removed from this group if their account is deleted or if you wish to punish a troublemaker.\r\n\r\nVisitors\r\nVisitors are users who are not logged in using an account on the system. Also, if you wish to punish a registered user you could remove him/her from the Registered Users group and insert him/her into the Visitors group.','0'); INSERT INTO help VALUES (11,'US English','Edit','Style','Style Name\r\nSee Add Style for details.\r\n\r\nHeader\r\nSee Add Style for details.\r\n\r\nFooter\r\nSee Add Style for details.\r\n\r\nStyle Sheet\r\nSee Add Style for details.\r\n\r\n','18,19'); -INSERT INTO help VALUES (12,'US English','Edit','Settings','Settings are items that allow you to adjust WebGUI to your particular needs.\r\n\r\nPath to WebGUI Extras\r\nThe web-path to the directory containing WebGUI images and javascript files.\r\n\r\nSession Timeout\r\nThe time (in seconds) that a user session remains active (before needing to log in again). This timeout is reset each time a visitor hits a page. Therefore if you set the timeout for 8 hours, a user would have to log in again if s/he hadn\'t visited the site for 8 hours.\r\n\r\n1800 = half hour\r\n3600 = 1 hour\r\n28000 = 8 hours\r\n86400 = 1 day\r\n604800 = 1 week\r\n1209600 = 2 weeks\r\n\r\nMaximum Attachment Size\r\nThe maximum size of files allowed to be uploaded to this site. This applies to all widgets that allow uploaded files and images (like Article and User Contributions). This size is measured in kilobytes.\r\n\r\nWeb Attachment Path\r\nThe web-path of the directory where attachments are to be stored.\r\n\r\nServer Attachment Path\r\nThe local path of the directory where attachments are to be stored. (Perhaps /var/www/public/uploads) Be sure that the web server has the rights to write to that directory.\r\n\r\nSMTP Server\r\nThis is the address of your local mail server. It is needed for all features that use the Internet email system (such as password recovery).\r\n\r\nCompany Name\r\nThe name of your company. It will appear on all emails and anywhere you use the Company Name macro.\r\n\r\nCompany Email Address\r\nA general email address at your company. This is the address that all automated messages will come from. It can also be used via the WebGUI macro system.\r\n\r\nCompany URL\r\nThe primary URL of your company. This will appear on all automated emails sent from the WebGUI system. It is also available via the WebGUI macro system.\r\n\r\n\r\n','19'); +INSERT INTO help VALUES (12,'US English','Edit','Settings','Settings are items that allow you to adjust WebGUI to your particular needs.\r\n\r\nPath to WebGUI Extras\r\nThe web-path to the directory containing WebGUI images and javascript files.\r\n\r\nMaximum Attachment Size\r\nThe maximum size of files allowed to be uploaded to this site. This applies to all widgets that allow uploaded files and images (like Article and User Contributions). This size is measured in kilobytes.\r\n\r\nWeb Attachment Path\r\nThe web-path of the directory where attachments are to be stored.\r\n\r\nServer Attachment Path\r\nThe local path of the directory where attachments are to be stored. (Perhaps /var/www/public/uploads) Be sure that the web server has the rights to write to that directory.\r\n\r\nCompany Name\r\nThe name of your company. It will appear on all emails and anywhere you use the Company Name macro.\r\n\r\nCompany Email Address\r\nA general email address at your company. This is the address that all automated messages will come from. It can also be used via the WebGUI macro system.\r\n\r\nCompany URL\r\nThe primary URL of your company. This will appear on all automated emails sent from the WebGUI system. It is also available via the WebGUI macro system.\r\n\r\nAuthentication Method (default)\r\nWhat should the default authentication method be for new accounts that are created? The two available options are WebGUI and LDAP. WebGUI authentication means that the users will authenticate against the username and password stored in the WebGUI database. LDAP authentication means that users will authenticate against an external LDAP server.\r\n\r\nNote: Authentication settings can be customized on a per user basis.\r\n\r\nLDAP URL (default)\r\nThe default url to your LDAP server. The LDAP URL takes the form of ldap://[server]:[port]/[base DN]. Example: ldap://ldap.mycompany.com:389/o=MyCompany.\r\n\r\nLDAP Identity\r\nThe LDAP Identity is the unique identifier in the LDAP server that the user will be identified against. Often this field is shortname, which takes the form of first initial + last name. Example: jdoe. Therefore if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process.\r\n\r\nLDAP Identity Name\r\nThe label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consitency.\r\n\r\nLDAP Password Name\r\nJust as the LDAP Identity Name is a label, so is the LDAP Password Name. Use this label as you would LDAP Identity Name.\r\n\r\nSession Timeout\r\nThe time (in seconds) that a user session remains active (before needing to log in again). This timeout is reset each time a visitor hits a page. Therefore if you set the timeout for 8 hours, a user would have to log in again if s/he hadn\'t visited the site for 8 hours.\r\n\r\n1800 = half hour\r\n3600 = 1 hour\r\n28000 = 8 hours\r\n86400 = 1 day\r\n604800 = 1 week\r\n1209600 = 2 weeks\r\n\r\nSMTP Server\r\nThis is the address of your local mail server. It is needed for all features that use the Internet email system (such as password recovery).\r\n\r\n\r\n','19'); INSERT INTO help VALUES (13,'US English','Edit','Group','Group Name\r\nSee Add Group for details.\r\n\r\nDescription\r\nSee Add Group for details.\r\n','0'); INSERT INTO help VALUES (14,'US English','Delete','Widget','This function permanently deletes the selected widget from a page. If you are unsure whether you wish to delete this content you may be better served to cut the content to the clipboard until you are certain you wish to delete it.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); INSERT INTO help VALUES (15,'US English','Delete','Group','As the function suggests you\'ll be deleting a group and removing all users from the group. Be careful not to orphan users from pages they should have access to by deleting a group that is in use.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); @@ -334,7 +334,7 @@ INSERT INTO help VALUES (16,'US English','Add','Style','Styles are WebGUI macro INSERT INTO help VALUES (17,'US English','Add','Group','See Manage Group for a description of grouping functions and the default groups.\r\n\r\nGroup Name\r\nA name for the group. It is best if the name is descriptive so you know what it is at a glance.\r\n\r\nDescription\r\nA longer description of the group so that other admins and content managers (or you if you forget) will know what the purpose of this group is.','0'); INSERT INTO help VALUES (22,'US English','Edit','SQL Report','Title\r\nSee Add SQL Report for details.\r\n\r\nDisplay Title?\r\nSee Add SQL Report for details.\r\n\r\nProcess Macros\r\nSee Add SQL Report for details.\r\n\r\nDescription\r\nSee Add SQL Report for details.\r\n\r\nTemplate\r\nSee Add SQL Report for details.\r\n\r\nQuery\r\nSee Add SQL Report for details.\r\n\r\nDSN\r\nSee Add SQL Report for details.\r\n\r\nDatabase User\r\nSee Add SQL Report for details.\r\n\r\nDatabase Password\r\nSee Add SQL Report for details.\r\n\r\nConvert carriage returns?\r\nSee Add SQL Report for details.\r\n\r\n','19,14,21'); INSERT INTO help VALUES (18,'US English','Using','Style Sheets','Cascading Style Sheets (CSS) are a great way to manage the look and feel of any web site. They are used extensively in WebGUI.\r\n\r\nIf you are unfamiliar with how to use CSS, Plain Black Software provides training classes on XHTML and CSS. Alternatively, Bradsoft makes an excellent CSS editor called Top Style.\r\n\r\nThe following is a list of classes used to control the look of WebGUI:\r\n\r\nA\r\nThe links throughout the style.\r\n\r\nBODY\r\nThe default setup of all pages within a style.\r\n\r\nH1\r\nThe headers on every page.\r\n\r\n.accountOptions\r\nThe links that appear under the login and account update forms.\r\n\r\n.adminBar \r\nThe bar that appears at the top of the page when you\'re in admin mode.\r\n\r\n.boardMenu \r\nThe menu on the message boards.\r\n\r\n.boardMessage \r\nThe full message text.\r\n\r\n.boardTitle \r\nThe title of the message board.\r\n\r\n.content\r\nThe main content area on all pages of the style.\r\n\r\n.crumbTrail \r\nThe crumb trail (if you\'re using that macro).\r\n\r\n.eventTitle \r\nThe title of an individual event.\r\n\r\n.faqQuestion\r\nAn F.A.Q. question. To distinguish it from an answer.\r\n\r\n.formDescription \r\nThe tags on all forms next to the form elements. \r\n\r\n.formSubtext \r\nThe tags below some form elements.\r\n\r\n.highlight \r\nDenotes a highlighted item, such as which message you are viewing within a list.\r\n\r\n.horizontalMenu \r\nThe horizontal menu (if you use a horizontal menu macro).\r\n\r\n.loginBox\r\nThe login box macro.\r\n\r\n.pagination \r\nThe Previous and Next links on pages with pagination.\r\n\r\n.pollAnswer \r\nAn answer on a poll.\r\n\r\n.pollColor \r\nThe color of the percentage bar on a poll.\r\n\r\n.pollQuestion \r\nThe question on a poll.\r\n\r\n.tableData \r\nThe data rows on things like message boards and user contributions.\r\n\r\n.tableHeader \r\nThe headings of columns on things like message boards and user contributions.\r\n\r\n.verticalMenu \r\nThe vertical menu (if you use a verticall menu macro).\r\n\r\n','11,16'); -INSERT INTO help VALUES (19,'US English','Using','Macros','WebGUI macros are used to create dynamic content within otherwise static content. For instance, you may wish to show which user is logged in on every page, or you may wish to have a dynamically built menu or crumb trail. \r\n\r\nMacros always begin with a carat (^) and follow with one other character. The following is a description of all the macros in the WebGUI system.\r\n\r\n^^ - Carat\r\nSince the carat symbol is used to start all macros, this macro is in place just in case you really wanted to use a carat somewhere.\r\n\r\n^/ - System URL\r\nThe URL to the gateway script (including the domain for this site). This is often used within pages so that if your development server is on a domain different than your production server that your URLs will still worked when moved.\r\n\r\n^@ - Username\r\nThe username of the currently logged in user.\r\n\r\n^# - User ID\r\nThe user id of the currently logged in user.\r\n\r\n^* - Random Number\r\nA randomly generated number. This is often used on images (such as banner ads) that you want to ensure do not cache.\r\n\r\n^a - My Account Link\r\nA link to your account information.\r\n\r\n^C - Crumb Trail\r\nA dynamically generated crumb trail to the current page.\r\n\r\n^D - Date\r\nThe current date and time.\r\n\r\n^f - Full Menu (Vertical)\r\nDisplays a complete menu listing for all pages on the site, sort of like a site map.\r\n\r\n^F - 2 Level Menu (Vertical)\r\nDisplays the first two levels of the menuing hierarchy at all times.\r\n\r\n^h - 3 Level Menu (Vertical)\r\nDisplays the first three levels of the menuing hierarchy at all times.\r\n\r\n^H - Home Link\r\nA link to the home page of this site.\r\n\r\n^L - Login\r\nA small login form.\r\n\r\n^M - Current Menu (Vertical)\r\nA vertical menu containing the sub-pages at the current level.\r\n\r\n^m - Current Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the current level.\r\n\r\n^P - Previous Menu (Vertical)\r\nA vertical menu containing the sub-pages at the previous level.\r\n\r\n^p - Previous Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the previous level.\r\n\r\n^r - Make Page Printable\r\nCreates a link to remove the style from a page to make it printable.\r\n\r\n^T - Top Level Menu (Vertical)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n^t - Top Level Menu (Horizontal)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n','11,16,12'); +INSERT INTO help VALUES (19,'US English','Using','Macros','WebGUI macros are used to create dynamic content within otherwise static content. For instance, you may wish to show which user is logged in on every page, or you may wish to have a dynamically built menu or crumb trail. \r\n\r\nMacros always begin with a carat (^) and follow with one other character. The following is a description of all the macros in the WebGUI system.\r\n\r\n^^ - Carat\r\nSince the carat symbol is used to start all macros, this macro is in place just in case you really wanted to use a carat somewhere.\r\n\r\n^/ - System URL\r\nThe URL to the gateway script (including the domain for this site). This is often used within pages so that if your development server is on a domain different than your production server that your URLs will still worked when moved.\r\n\r\n^\\ - Page URL\r\nThe URL to the current page (including the domain for this site). This is often used within pages so that if your development server is on a domain different than your production server that your URLs will still worked when moved.\r\n\r\n^@ - Username\r\nThe username of the currently logged in user.\r\n\r\n^# - User ID\r\nThe user id of the currently logged in user.\r\n\r\n^* - Random Number\r\nA randomly generated number. This is often used on images (such as banner ads) that you want to ensure do not cache.\r\n\r\n^a - My Account Link\r\nA link to your account information.\r\n\r\n^C - Crumb Trail\r\nA dynamically generated crumb trail to the current page.\r\n\r\n^D - Date\r\nThe current date and time.\r\n\r\n^f - Full Menu (Vertical)\r\nDisplays a complete menu listing for all pages on the site, sort of like a site map.\r\n\r\n^F - 2 Level Menu (Vertical)\r\nDisplays the first two levels of the menuing hierarchy at all times.\r\n\r\n^h - 3 Level Menu (Vertical)\r\nDisplays the first three levels of the menuing hierarchy at all times.\r\n\r\n^H - Home Link\r\nA link to the home page of this site.\r\n\r\n^j - 2 Level, Current Level Menu (Vertical)\r\nDisplays the next two levels of the menuing hierarchy.\r\n\r\n^J - 3 Level, Current Level Menu (Vertical)\r\nDisplays the next three levels of the menuing hierarchy.\r\n\r\n^L - Login\r\nA small login form.\r\n\r\n^M - Current Menu (Vertical)\r\nA vertical menu containing the sub-pages at the current level.\r\n\r\n^m - Current Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the current level.\r\n\r\n^P - Previous Menu (Vertical)\r\nA vertical menu containing the sub-pages at the previous level.\r\n\r\n^p - Previous Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the previous level.\r\n\r\n^r - Make Page Printable\r\nCreates a link to remove the style from a page to make it printable.\r\n\r\n^T - Top Level Menu (Vertical)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n^t - Top Level Menu (Horizontal)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n','11,16,12'); INSERT INTO help VALUES (20,'US English','Add','SQL Report','SQL Reports are perhaps the most powerful widget in the WebGUI arsenal. They allow a user to query data from any database that they have access to. This is great for getting sales figures from your Accounting database or even summarizing all the message boards on your web site.\r\n\r\nTitle\r\nThe title of this report.\r\n\r\nDisplay Title?\r\nDo you wish to display the title of the report? If so, check the box.\r\n\r\nProcess Macros\r\nDo you wish to process WebGUI Macros on this report? If so, check the box.\r\n\r\nDescription\r\nDescribe the content of this report so your users will better understand what the report is all about.\r\n\r\nTemplate\r\nLayout a template of how this report should look. Usually you\'ll use HTML tables to generate a report. An example is included below.\r\n\r\nThere are 11 special macro characters used in generating SQL Reports. They are ^-, ^0, ^1, ^2, ^3, ^4, ^5, ^6, ^7, ^8, and ^9. These macros will be processed regardless of whether you checked the process macros box above. The ^- macro represents split points in the document where the report will begin and end looping. The numeric macros represent the data fields that will be returned from your query. Note that you may only have 10 fields returned per row in your query.\r\n\r\nSample Template:\r\n<table>\r\n<tr><th>Employee Name</th><th>Employee #</th><th>Vacation Days Remaining</th><th>Monthly Salary</th></tr>\r\n^-\r\n<tr><td>^0</td><td>^1</td><td>^2</td><td>^3</td></tr>\r\n^-\r\n</table>\r\n\r\nQuery\r\nThis is a standard SQL query. If you are unfamiliar with SQL, Plain Black Software provides training courses in SQL and database management.\r\n\r\nDSN\r\nData Source Name is the unique identifier that Perl uses to describe the location of your database. It takes the format of DBI:[driver]:[database name]:[host]. \r\n\r\nExample: DBI:mysql:WebGUI:localhost\r\n\r\nDatabase User\r\nThe username you use to connect to the DSN.\r\n\r\nDatabase Password\r\nThe password you use to connect to the DSN.\r\n\r\nConvert carriage returns?\r\nDo you wish to convert the carriage returns in the resultant data to HTML breaks (<br>).\r\n','19,14,21'); INSERT INTO help VALUES (21,'US English','Using','Widget','Widgets are the true power of WebGUI. Widgets are tiny pluggable applications built to run under WebGUI. Message boards and polls are examples of widgets.\r\n\r\nTo add a widget to a page, first go to that page, then select Add Content... from the upper left corner of your screen. Each widget has it\'s own help so be sure to read the help if you\'re not sure how to use a widget.\r\n','0'); INSERT INTO help VALUES (23,'US English','Add','Article','Articles are the Swiss Army knife of WebGUI. Most pieces of static content can be added via the Article widget.\r\n\r\nTitle\r\nWhat\'s the title for this content? Even if you don\'t wish the title to appear, it\'s a good idea to title your content so that if it is ever copied to the clipboard it will have a name.\r\n\r\nDisplay the title?\r\nDo you wish to display the title listed above?\r\n\r\nProcess macros?\r\nDo you wish to process WebGUI macros on this article? Unchecking this box will not process macros and will speed up page execution.\r\n\r\nStart Date\r\nWhat date do you want this article to appear on the site? Dates are in the format of MM/DD/YYYY. You can use the JavaScript wizard to choose your date from a calendar by clicking on the set date button. By default the date is set to 01/01/2000.\r\n\r\nEnd Date\r\nWhat date do you want this article to be removed from the site? By default the date is set to 100 years in the future, 01/01/2100.\r\n\r\nBody\r\nThe body of the article is where all the content goes. You may feel free to add HTML tags as necessary to format your content. Be sure to put a <p> between paragraphs to add white space to your content.\r\n\r\nImage\r\nChoose an image (.jpg, .gif, .png) file from your hard drive. This file will be uploaded to the server and displayed in the upper-right corner of your article.\r\n\r\nLink Title\r\nIf you wish to add a link to your article, enter the title of the link in this field. \r\n\r\nExample: Google\r\n\r\nLink URL\r\nIf you added a link title, now add the URL (uniform resource locator) here. \r\n\r\nExample: http://www.google.com\r\n\r\nAttachment\r\nIf you wish to attach a word processor file, a zip file, or any other file for download by your users, then choose it from your hard drive.\r\n','14,21'); @@ -360,6 +360,7 @@ INSERT INTO help VALUES (42,'US English','Add','Search (MnoGo)','The Title\r\nSee Add Search (MnoGo) for details.\r\n\r\nDisplay the title?\r\nSee Add Search (MnoGo) for details.\r\n\r\nDescription\r\nSee Add Search (MnoGo) for details.\r\n\r\nDSN\r\nSee Add Search (MnoGo) for details.\r\n\r\nDatabase User\r\nSee Add Search (MnoGo) for details.\r\n\r\nDatabase Password\r\nSee Add Search (MnoGo) for details.\r\n','14,21'); INSERT INTO help VALUES (44,'US English','Add','User Submission System','User submission systems are a great way to add a sense of community to any site as well as get free content from your users.\r\n\r\nTitle\r\nWhat is the title for this user submission system?\r\n\r\nDisplay the title?\r\nWould you like the title displayed?\r\n\r\nDescription\r\nBriefly describe why this user submission system is here and what should be submitted to it.\r\n\r\nWho can contribute?\r\nWhat group is allowed to contribute content?\r\n\r\nSubmissions Per Page\r\nHow many submissions should be listed per page in the submissions index?\r\n\r\nDefault Status\r\nShould submissions be set to approved, pending, or denied by default?\r\n\r\nNote: If you set the default status to pending, then be prepared to monitor the pending queue under the Admin menu.\r\n','14,21'); INSERT INTO help VALUES (45,'US English','Edit','User Submission System','Title\r\nSee Add User Submission System for details.\r\n\r\nDisplay the title?\r\nSee Add User Submission System for details.\r\n\r\nDescription\r\nSee Add User Submission System for details.\r\n\r\nWho can contribute?\r\nSee Add User Submission System for details.\r\n\r\nSubmissions Per Page\r\nSee Add User Submission System for details.\r\n\r\nDefault Status\r\nSee Add User Submission System for details.\r\n','14,21'); +INSERT INTO help VALUES (46,'US English','Empty','Trash','If you choose to empty your trash, any items contained in it will be lost forever. If you\'re unsure about a few items, it might be best to cut them to your clipboard before you empty the trash.','0'); # # Table structure for table 'incrementer' @@ -526,6 +527,7 @@ CREATE TABLE session ( # Dumping data for table 'session' # +INSERT INTO session VALUES ('3|yJFcoK2pMVyHw','2001-09-16 03:09:06','2001-09-15 19:22:26',1,'10.0.0.20'); # # Table structure for table 'settings' @@ -548,8 +550,13 @@ INSERT INTO settings VALUES ('sessionTimeout','28000'); INSERT INTO settings VALUES ('attachmentDirectoryLocal','/data/WebGUI/uploads'); INSERT INTO settings VALUES ('smtpServer','smtp.mycompany.com'); INSERT INTO settings VALUES ('companyEmail','info@mycompany.com'); +INSERT INTO settings VALUES ('ldapURL','ldap://ldap.mycompany.com:389/o=MyCompany'); INSERT INTO settings VALUES ('companyName','My Company'); INSERT INTO settings VALUES ('companyURL','http://www.mycompany.com'); +INSERT INTO settings VALUES ('ldapId','shortname'); +INSERT INTO settings VALUES ('ldapIdName','LDAP Shortname'); +INSERT INTO settings VALUES ('ldapPasswordName','LDAP Password'); +INSERT INTO settings VALUES ('authMethod','WebGUI'); # # Table structure for table 'stopword' @@ -1238,6 +1245,9 @@ CREATE TABLE user ( identifier varchar(35) default NULL, email varchar(255) default NULL, icq varchar(30) default NULL, + authMethod varchar(30) NOT NULL default 'WebGUI', + ldapURL text, + connectDN varchar(255) default NULL, PRIMARY KEY (userId) ) TYPE=MyISAM; @@ -1245,31 +1255,31 @@ CREATE TABLE user ( # Dumping data for table 'user' # -INSERT INTO user VALUES (1,'Visitor','No Login','',''); -INSERT INTO user VALUES (2,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (3,'Admin','RvlMjeFPs2aAhQdo/xt/Kg','',''); -INSERT INTO user VALUES (4,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (5,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (6,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (7,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (8,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (9,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (10,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (11,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (12,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (13,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (14,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (15,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (16,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (17,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (18,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (19,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (20,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (21,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (22,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (23,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (24,'Reserved','No Login',NULL,NULL); -INSERT INTO user VALUES (25,'Reserved','No Login',NULL,NULL); +INSERT INTO user VALUES (1,'Visitor','No Login','','','WebGUI',NULL,NULL); +INSERT INTO user VALUES (2,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (3,'Admin','RvlMjeFPs2aAhQdo/xt/Kg','','','WebGUI',NULL,NULL); +INSERT INTO user VALUES (4,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (5,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (6,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (7,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (8,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (9,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (10,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (11,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (12,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (13,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (14,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (15,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (16,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (17,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (18,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (19,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (20,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (21,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (22,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (23,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (24,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); +INSERT INTO user VALUES (25,'Reserved','No Login',NULL,NULL,'WebGUI',NULL,NULL); # # Table structure for table 'widget' diff --git a/docs/upgrade-1.0.1_1.1.0.sql b/docs/upgrade-1.0.1_1.1.0.sql deleted file mode 100644 index 75d0b6ea3..000000000 --- a/docs/upgrade-1.0.1_1.1.0.sql +++ /dev/null @@ -1,59 +0,0 @@ -delete from help; - -INSERT INTO help VALUES (1,'US English','Add','Page','Think of pages as containers for content. For instance, if you want to write a letter to the editor of your favorite magazine you\'d get out a notepad (or open a word processor) and start filling it with your thoughts. The same is true with WebGUI. Create a page, then add your content to the page.\r\n\r\nTitle\r\nThe title of the page is what your users will use to navigate through the site. Titles should be descriptive, but not very long.\r\n\r\nMeta Tags\r\nMeta tags are used by some search engines to associate key words to a particular page. There is a great site called Meta Tag Builder that will help you build meta tags if you\'ve never done it before.\r\n\r\nAdvanced Users: If you have other things (like JavaScript) you usually put in the <head> area of your pages, you may put them here as well.','0'); -INSERT INTO help VALUES (2,'US English','Edit','Page','Title\r\nSee Add Page for details.\r\n\r\nMeta Tags\r\nSee Add Page for details.\r\n\r\nStyle\r\nBy default, when you create a page, it inherits a few traits from its parent. One of those traits is style. Choose from the list of styles if you would like to change the appearance of this page. See Add Style for more details.\r\n\r\nIf you check the box next to the style pull-down menu, all of the pages below this page will take on the style you\'ve chosen for this page.\r\n\r\nPage URL\r\nWhen you create a page a url for the page is generated based on the page title. If you are unhappy with the url that was chosen, you can change it here.\r\n\r\nOwner\r\nThe owner of a page is usually the person who created the page. If you\'d like to give ownership of a page to a different content manager, then change the name here. Be careful though, once you change ownership of the page, you won\'t be able to get it back unless you are an administrator.\r\n\r\nOwner can view?\r\nCan the owner view the page or not?\r\n\r\nOwner can edit?\r\nCan the owner edit the page or not? Be careful, if you decide that the owner cannot edit the page and you do not belong to the page group, then you\'ll lose the ability to edit this page.\r\n\r\nGroup\r\nA group is assigned to every page for additional privilege control. Pick a group from the pull-down menu.\r\n\r\nGroup can view?\r\nCan members of this group view this page?\r\n\r\nGroup can edit?\r\nCan members of this group edit this page?\r\n\r\nAnybody can view?\r\nCan any visitor or member regardless of the group and owner view this page?\r\n\r\nAnybody can edit?\r\nCan any visitor or member regardless of the group and owner edit this page?\r\n\r\n','9'); -INSERT INTO help VALUES (3,'US English','Delete','Page','Deleting a page can create a big mess if you are uncertain about what you are doing. When you delete a page you are also deleting the content it contains, all sub-pages connected to this page, and all the content they contain. Be certain that you have already moved all the content you wish to keep before you delete a page.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (4,'US English','Delete','Style','When you delete a style all pages using that style will be reverted to the fail safe (default) style. To ensure uninterrupted viewing, you should be sure that no pages are using a style before you delete it.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (5,'US English','Add','User','See Manage Users for additional details.\r\n\r\nUsername\r\nUsername is a unique identifier for a user. Sometimes called a handle, it is also how the user will be known on the site. (Note: Administrators have unlimited power in the WebGUI system. This also means they are capable of breaking the system. If you rename or create a user, be careful not to use a username already in existance.)\r\n\r\nPassword\r\nA password is used to ensure that the user is who s/he says s/he is.\r\n\r\nAuthentication Method\r\nSee Edit Settings for details.\r\n\r\nLDAP URL\r\nSee Edit Settings for details.\r\n\r\nConnect DN\r\nThe Connect DN is the cn (or common name) of a given user in your LDAP database. It should be specified as cn=John Doe. This is, in effect, the username that will be used to authenticate this user against your LDAP server.\r\n\r\nEmail Address\r\nThe user\'s email address. This must only be specified if the user will partake in functions that require email.\r\n\r\nICQ UIN\r\nThe ICQ UIN is the \"User ID Number\" on the ICQ network. ICQ is a very popular instant messaging platform.\r\n\r\nGroups\r\nGroups displays which groups the user is in. Groups that are highlighted are groups that the user is assigned to. Those that are not highlighted are other groups that can be assigned. Note that you must hold down CTRL to select multiple groups.','0'); -INSERT INTO help VALUES (6,'US English','Edit','User','Username\r\nSee Add User for details.\r\n\r\nPassword\r\nSee Add User for details.\r\n\r\nAuthentication Method\r\nSee Edit Settings for details.\r\n\r\nLDAP URL\r\nSee Edit Settings for details.\r\n\r\nConnect DN\r\nSee Add User for details.\r\n\r\nEmail Address\r\nSee Add User for details.\r\n\r\nICQ UIN\r\nSee Add User for details.\r\n\r\nGroups\r\nSee Add User for details.\r\n\r\n','12'); -INSERT INTO help VALUES (7,'US English','Delete','User','There is no need to ever actually delete a user. If you are concerned with locking out a user, then simply change their password. If you truely wish to delete a user, then please keep in mind that there are consequences. If you delete a user any content that they added to the site via widgets (like message boards and user contributions) will remain on the site. However, if another user tries to visit the deleted user\'s profile they will get an error message. Also if the user ever is welcomed back to the site, there is no way to give him/her access to his/her old content items except by re-adding the user to the users table manually.\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (8,'US English','Manage','User','Users are the accounts in the system that are given rights to do certain things. There are two default users built into the system: Admin and Visitor.\r\n\r\nAdmin\r\nAdmin is exactly what you\'d expect. It is a user with unlimited rights in the WebGUI environment. If it can be done, this user has the rights to do it.\r\n\r\nVisitor\r\nVisitor is exactly the opposite of Admin. Visitor has no rights what-so-ever. By default any user who is not logged in is seen as the user Visitor.','0'); -INSERT INTO help VALUES (9,'US English','Manage','Style','Styles are used to manage the look and feel of your WebGUI pages. With WebGUI, you can have an unlimited number of styles, so your site can take on as many looks as you like. You could have some pages that look like your company\'s brochure, and some pages that look like Yahoo!®. You could even have some pages that look like pages in a book. Using style management, you have ultimate control over all your designs.\r\n\r\nThere are three styles built in to WebGUI: Fail Safe, Plain Black Software, and Yahoo!®. These styles are not meant to be edited, but rather to give you samples of what\'s possible.\r\n\r\nFail Safe\r\nWhen you delete a style that is still in use on some pages, the Fail Safe style will be applied to those pages. This style has a white background and simple navigation.\r\n\r\nPlain Black Software\r\nThis is the simple design used on the Plain Black Software site.\r\n\r\nYahoo!®\r\nThis is the design of the Yahoo!® site. (Yahoo!® has not given us permission to use their design. It is simply an example.)','0'); -INSERT INTO help VALUES (10,'US English','Manage','Group','Groups are used to subdivide privileges and responsibilities within the WebGUI system. For instance, you may be building a site for a classroom situation. In that case you might set up a different group for each class that you teach. You would then apply those groups to the pages that are designed for each class.\r\n\r\nThere are four groups built into WebGUI. They are Admins, Content Managers, Visitors, and Registered Users.\r\n\r\nAdmins\r\nAdmins are users who have unlimited privileges within WebGUI. A user should only be added to the admin group if they oversee the system. Usually only one to three people will be added to this group.\r\n\r\nContent Managers\r\nContent managers are users who have privileges to add, edit, and delete content from various areas on the site. The content managers group should not be used to control individual content areas within the site, but to determine whether a user can edit content at all. You should set up additional groups to separate content areas on the site.\r\n\r\nRegistered Users\r\nWhen users are added to the system they are put into the registered users group. A user should only be removed from this group if their account is deleted or if you wish to punish a troublemaker.\r\n\r\nVisitors\r\nVisitors are users who are not logged in using an account on the system. Also, if you wish to punish a registered user you could remove him/her from the Registered Users group and insert him/her into the Visitors group.','0'); -INSERT INTO help VALUES (11,'US English','Edit','Style','Style Name\r\nSee Add Style for details.\r\n\r\nHeader\r\nSee Add Style for details.\r\n\r\nFooter\r\nSee Add Style for details.\r\n\r\nStyle Sheet\r\nSee Add Style for details.\r\n\r\n','18,19'); -INSERT INTO help VALUES (12,'US English','Edit','Settings','Settings are items that allow you to adjust WebGUI to your particular needs.\r\n\r\nPath to WebGUI Extras\r\nThe web-path to the directory containing WebGUI images and javascript files.\r\n\r\nMaximum Attachment Size\r\nThe maximum size of files allowed to be uploaded to this site. This applies to all widgets that allow uploaded files and images (like Article and User Contributions). This size is measured in kilobytes.\r\n\r\nWeb Attachment Path\r\nThe web-path of the directory where attachments are to be stored.\r\n\r\nServer Attachment Path\r\nThe local path of the directory where attachments are to be stored. (Perhaps /var/www/public/uploads) Be sure that the web server has the rights to write to that directory.\r\n\r\nCompany Name\r\nThe name of your company. It will appear on all emails and anywhere you use the Company Name macro.\r\n\r\nCompany Email Address\r\nA general email address at your company. This is the address that all automated messages will come from. It can also be used via the WebGUI macro system.\r\n\r\nCompany URL\r\nThe primary URL of your company. This will appear on all automated emails sent from the WebGUI system. It is also available via the WebGUI macro system.\r\n\r\nAuthentication Method (default)\r\nWhat should the default authentication method be for new accounts that are created? The two available options are WebGUI and LDAP. WebGUI authentication means that the users will authenticate against the username and password stored in the WebGUI database. LDAP authentication means that users will authenticate against an external LDAP server.\r\n\r\nNote: Authentication settings can be customized on a per user basis.\r\n\r\nLDAP URL (default)\r\nThe default url to your LDAP server. The LDAP URL takes the form of ldap://[server]:[port]/[base DN]. Example: ldap://ldap.mycompany.com:389/o=MyCompany.\r\n\r\nLDAP Identity\r\nThe LDAP Identity is the unique identifier in the LDAP server that the user will be identified against. Often this field is shortname, which takes the form of first initial + last name. Example: jdoe. Therefore if you specify the LDAP identity to be shortname then Jon Doe would enter jdoe during the registration process.\r\n\r\nLDAP Identity Name\r\nThe label used to describe the LDAP Identity to the user. For instance, some companies use an LDAP server for their proxy server users to authenticate against. In the documentation or training already provided to their users, the LDAP identity is known as their Web Username. So you could enter that label here for consitency.\r\n\r\nLDAP Password Name\r\nJust as the LDAP Identity Name is a label, so is the LDAP Password Name. Use this label as you would LDAP Identity Name.\r\n\r\nSession Timeout\r\nThe time (in seconds) that a user session remains active (before needing to log in again). This timeout is reset each time a visitor hits a page. Therefore if you set the timeout for 8 hours, a user would have to log in again if s/he hadn\'t visited the site for 8 hours.\r\n\r\n1800 = half hour\r\n3600 = 1 hour\r\n28000 = 8 hours\r\n86400 = 1 day\r\n604800 = 1 week\r\n1209600 = 2 weeks\r\n\r\nSMTP Server\r\nThis is the address of your local mail server. It is needed for all features that use the Internet email system (such as password recovery).\r\n\r\n\r\n','19'); -INSERT INTO help VALUES (13,'US English','Edit','Group','Group Name\r\nSee Add Group for details.\r\n\r\nDescription\r\nSee Add Group for details.\r\n','0'); -INSERT INTO help VALUES (14,'US English','Delete','Widget','This function permanently deletes the selected widget from a page. If you are unsure whether you wish to delete this content you may be better served to cut the content to the clipboard until you are certain you wish to delete it.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (15,'US English','Delete','Group','As the function suggests you\'ll be deleting a group and removing all users from the group. Be careful not to orphan users from pages they should have access to by deleting a group that is in use.\r\n\r\nAs with any delete operation, you are prompted to be sure you wish to proceed with the delete. If you answer yes, the delete will proceed and there is no recovery possible. If you answer no you\'ll be returned to the prior screen.','0'); -INSERT INTO help VALUES (16,'US English','Add','Style','Styles are WebGUI macro enabled. See Using Macros for more information.\r\n\r\nStyle Name\r\nA unique name to describe what this style looks like at a glance. The name has no effect on the actual look of the style.\r\n\r\nHeader\r\nThe header is the start of the look of your site. It is helpful to look at your design and cut it into three pieces. The top and left of your design is the header. The center part is the content, and the right and bottom is the footer. Cut the HTML from your header and paste it in the space provided.\r\n\r\nIf you are in need of assistance for creating a look for your site, or if you need help cutting apart your design, Plain Black Software provides support services for a small fee.\r\n\r\nMany people will add WebGUI macros to their header for automated navigation, and other features.\r\n\r\nFooter\r\nThe footer is the end of the look for your site. It is the right and bottom portion of your design. You may also place WebGUI macros in your footer.\r\n\r\nStyle Sheet\r\nPlace your style sheet entries here. Style sheets are used to control colors, sizes, and other properties of the elements on your site. See Using Style Sheets for more information.\r\n\r\nAdvanced Users: for greater performance create your stylesheet on the file system (call it something like webgui.css) and add an entry like this to this area: \r\n<link href=\"/webgui.css\" rel=\"stylesheet\" rev=\"stylesheet\" type=\"text/css\">','18,19'); -INSERT INTO help VALUES (17,'US English','Add','Group','See Manage Group for a description of grouping functions and the default groups.\r\n\r\nGroup Name\r\nA name for the group. It is best if the name is descriptive so you know what it is at a glance.\r\n\r\nDescription\r\nA longer description of the group so that other admins and content managers (or you if you forget) will know what the purpose of this group is.','0'); -INSERT INTO help VALUES (22,'US English','Edit','SQL Report','Title\r\nSee Add SQL Report for details.\r\n\r\nDisplay Title?\r\nSee Add SQL Report for details.\r\n\r\nProcess Macros\r\nSee Add SQL Report for details.\r\n\r\nDescription\r\nSee Add SQL Report for details.\r\n\r\nTemplate\r\nSee Add SQL Report for details.\r\n\r\nQuery\r\nSee Add SQL Report for details.\r\n\r\nDSN\r\nSee Add SQL Report for details.\r\n\r\nDatabase User\r\nSee Add SQL Report for details.\r\n\r\nDatabase Password\r\nSee Add SQL Report for details.\r\n\r\nConvert carriage returns?\r\nSee Add SQL Report for details.\r\n\r\n','19,14,21'); -INSERT INTO help VALUES (18,'US English','Using','Style Sheets','Cascading Style Sheets (CSS) are a great way to manage the look and feel of any web site. They are used extensively in WebGUI.\r\n\r\nIf you are unfamiliar with how to use CSS, Plain Black Software provides training classes on XHTML and CSS. Alternatively, Bradsoft makes an excellent CSS editor called Top Style.\r\n\r\nThe following is a list of classes used to control the look of WebGUI:\r\n\r\nA\r\nThe links throughout the style.\r\n\r\nBODY\r\nThe default setup of all pages within a style.\r\n\r\nH1\r\nThe headers on every page.\r\n\r\n.accountOptions\r\nThe links that appear under the login and account update forms.\r\n\r\n.adminBar \r\nThe bar that appears at the top of the page when you\'re in admin mode.\r\n\r\n.boardMenu \r\nThe menu on the message boards.\r\n\r\n.boardMessage \r\nThe full message text.\r\n\r\n.boardTitle \r\nThe title of the message board.\r\n\r\n.content\r\nThe main content area on all pages of the style.\r\n\r\n.crumbTrail \r\nThe crumb trail (if you\'re using that macro).\r\n\r\n.eventTitle \r\nThe title of an individual event.\r\n\r\n.faqQuestion\r\nAn F.A.Q. question. To distinguish it from an answer.\r\n\r\n.formDescription \r\nThe tags on all forms next to the form elements. \r\n\r\n.formSubtext \r\nThe tags below some form elements.\r\n\r\n.highlight \r\nDenotes a highlighted item, such as which message you are viewing within a list.\r\n\r\n.horizontalMenu \r\nThe horizontal menu (if you use a horizontal menu macro).\r\n\r\n.loginBox\r\nThe login box macro.\r\n\r\n.pagination \r\nThe Previous and Next links on pages with pagination.\r\n\r\n.pollAnswer \r\nAn answer on a poll.\r\n\r\n.pollColor \r\nThe color of the percentage bar on a poll.\r\n\r\n.pollQuestion \r\nThe question on a poll.\r\n\r\n.tableData \r\nThe data rows on things like message boards and user contributions.\r\n\r\n.tableHeader \r\nThe headings of columns on things like message boards and user contributions.\r\n\r\n.verticalMenu \r\nThe vertical menu (if you use a verticall menu macro).\r\n\r\n','11,16'); -INSERT INTO help VALUES (19,'US English','Using','Macros','WebGUI macros are used to create dynamic content within otherwise static content. For instance, you may wish to show which user is logged in on every page, or you may wish to have a dynamically built menu or crumb trail. \r\n\r\nMacros always begin with a carat (^) and follow with one other character. The following is a description of all the macros in the WebGUI system.\r\n\r\n^^ - Carat\r\nSince the carat symbol is used to start all macros, this macro is in place just in case you really wanted to use a carat somewhere.\r\n\r\n^/ - System URL\r\nThe URL to the gateway script (including the domain for this site). This is often used within pages so that if your development server is on a domain different than your production server that your URLs will still worked when moved.\r\n\r\n^\\ - Page URL\r\nThe URL to the current page (including the domain for this site). This is often used within pages so that if your development server is on a domain different than your production server that your URLs will still worked when moved.\r\n\r\n^@ - Username\r\nThe username of the currently logged in user.\r\n\r\n^# - User ID\r\nThe user id of the currently logged in user.\r\n\r\n^* - Random Number\r\nA randomly generated number. This is often used on images (such as banner ads) that you want to ensure do not cache.\r\n\r\n^a - My Account Link\r\nA link to your account information.\r\n\r\n^C - Crumb Trail\r\nA dynamically generated crumb trail to the current page.\r\n\r\n^D - Date\r\nThe current date and time.\r\n\r\n^f - Full Menu (Vertical)\r\nDisplays a complete menu listing for all pages on the site, sort of like a site map.\r\n\r\n^F - 2 Level Menu (Vertical)\r\nDisplays the first two levels of the menuing hierarchy at all times.\r\n\r\n^h - 3 Level Menu (Vertical)\r\nDisplays the first three levels of the menuing hierarchy at all times.\r\n\r\n^H - Home Link\r\nA link to the home page of this site.\r\n\r\n^j - 2 Level, Current Level Menu (Vertical)\r\nDisplays the next two levels of the menuing hierarchy.\r\n\r\n^J - 3 Level, Current Level Menu (Vertical)\r\nDisplays the next three levels of the menuing hierarchy.\r\n\r\n^L - Login\r\nA small login form.\r\n\r\n^M - Current Menu (Vertical)\r\nA vertical menu containing the sub-pages at the current level.\r\n\r\n^m - Current Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the current level.\r\n\r\n^P - Previous Menu (Vertical)\r\nA vertical menu containing the sub-pages at the previous level.\r\n\r\n^p - Previous Menu (Horizontal)\r\nA horizontal menu containing the sub-pages at the previous level.\r\n\r\n^r - Make Page Printable\r\nCreates a link to remove the style from a page to make it printable.\r\n\r\n^T - Top Level Menu (Vertical)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n^t - Top Level Menu (Horizontal)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page).\r\n\r\n','11,16,12'); -INSERT INTO help VALUES (20,'US English','Add','SQL Report','SQL Reports are perhaps the most powerful widget in the WebGUI arsenal. They allow a user to query data from any database that they have access to. This is great for getting sales figures from your Accounting database or even summarizing all the message boards on your web site.\r\n\r\nTitle\r\nThe title of this report.\r\n\r\nDisplay Title?\r\nDo you wish to display the title of the report? If so, check the box.\r\n\r\nProcess Macros\r\nDo you wish to process WebGUI Macros on this report? If so, check the box.\r\n\r\nDescription\r\nDescribe the content of this report so your users will better understand what the report is all about.\r\n\r\nTemplate\r\nLayout a template of how this report should look. Usually you\'ll use HTML tables to generate a report. An example is included below.\r\n\r\nThere are 11 special macro characters used in generating SQL Reports. They are ^-, ^0, ^1, ^2, ^3, ^4, ^5, ^6, ^7, ^8, and ^9. These macros will be processed regardless of whether you checked the process macros box above. The ^- macro represents split points in the document where the report will begin and end looping. The numeric macros represent the data fields that will be returned from your query. Note that you may only have 10 fields returned per row in your query.\r\n\r\nSample Template:\r\n<table>\r\n<tr><th>Employee Name</th><th>Employee #</th><th>Vacation Days Remaining</th><th>Monthly Salary</th></tr>\r\n^-\r\n<tr><td>^0</td><td>^1</td><td>^2</td><td>^3</td></tr>\r\n^-\r\n</table>\r\n\r\nQuery\r\nThis is a standard SQL query. If you are unfamiliar with SQL, Plain Black Software provides training courses in SQL and database management.\r\n\r\nDSN\r\nData Source Name is the unique identifier that Perl uses to describe the location of your database. It takes the format of DBI:[driver]:[database name]:[host]. \r\n\r\nExample: DBI:mysql:WebGUI:localhost\r\n\r\nDatabase User\r\nThe username you use to connect to the DSN.\r\n\r\nDatabase Password\r\nThe password you use to connect to the DSN.\r\n\r\nConvert carriage returns?\r\nDo you wish to convert the carriage returns in the resultant data to HTML breaks (<br>).\r\n','19,14,21'); -INSERT INTO help VALUES (21,'US English','Using','Widget','Widgets are the true power of WebGUI. Widgets are tiny pluggable applications built to run under WebGUI. Message boards and polls are examples of widgets.\r\n\r\nTo add a widget to a page, first go to that page, then select Add Content... from the upper left corner of your screen. Each widget has it\'s own help so be sure to read the help if you\'re not sure how to use a widget.\r\n','0'); -INSERT INTO help VALUES (23,'US English','Add','Article','Articles are the Swiss Army knife of WebGUI. Most pieces of static content can be added via the Article widget.\r\n\r\nTitle\r\nWhat\'s the title for this content? Even if you don\'t wish the title to appear, it\'s a good idea to title your content so that if it is ever copied to the clipboard it will have a name.\r\n\r\nDisplay the title?\r\nDo you wish to display the title listed above?\r\n\r\nProcess macros?\r\nDo you wish to process WebGUI macros on this article? Unchecking this box will not process macros and will speed up page execution.\r\n\r\nStart Date\r\nWhat date do you want this article to appear on the site? Dates are in the format of MM/DD/YYYY. You can use the JavaScript wizard to choose your date from a calendar by clicking on the set date button. By default the date is set to 01/01/2000.\r\n\r\nEnd Date\r\nWhat date do you want this article to be removed from the site? By default the date is set to 100 years in the future, 01/01/2100.\r\n\r\nBody\r\nThe body of the article is where all the content goes. You may feel free to add HTML tags as necessary to format your content. Be sure to put a <p> between paragraphs to add white space to your content.\r\n\r\nImage\r\nChoose an image (.jpg, .gif, .png) file from your hard drive. This file will be uploaded to the server and displayed in the upper-right corner of your article.\r\n\r\nLink Title\r\nIf you wish to add a link to your article, enter the title of the link in this field. \r\n\r\nExample: Google\r\n\r\nLink URL\r\nIf you added a link title, now add the URL (uniform resource locator) here. \r\n\r\nExample: http://www.google.com\r\n\r\nAttachment\r\nIf you wish to attach a word processor file, a zip file, or any other file for download by your users, then choose it from your hard drive.\r\n','14,21'); -INSERT INTO help VALUES (24,'US English','Edit','Article','Title\r\nSee Add Article for details.\r\n\r\nDisplay the title?\r\nSee Add Article for details.\r\n\r\nProcess macros?\r\nSee Add Article for details.\r\n\r\nStart Date\r\nSee Add Article for details.\r\n\r\nEnd Date\r\nSee Add Article for details.\r\n\r\nBody\r\nSee Add Article for details.\r\n\r\nImage\r\nSee Add Article for details.\r\n\r\nLink Title\r\nSee Add Article for details.\r\n\r\nLink URL\r\nSee Add Article for details.\r\n\r\nAttachment\r\nSee Add Article for details.\r\n','14,21'); -INSERT INTO help VALUES (25,'US English','Add','Extra Column','Extra columns allow you to change the layout of your page for one page only. If you wish to have multiple columns on all your pages. Perhaps you should consider altering the style applied to your pages. \r\n\r\nColumns are always added from left to right. Therefore any existing content will be on the left of the new column.\r\n\r\nSpacer\r\nSpacer is the amount of space between your existing content and your new column. It is measured in pixels.\r\n\r\nWidth\r\nWidth is the actual width of the new column to be added. Width is measured in pixels.\r\n\r\nStyleSheet Class\r\nBy default the content style (which is the style the body of your site should be using) that is applied to all columns. However, if you\'ve created a style specifically for columns, then feel free to modify this class.\r\n','14,21,9,18'); -INSERT INTO help VALUES (26,'US English','Edit','Extra Column','Spacer\r\nSee Add Extra Column for details.\r\n\r\nWidth\r\nSee Add Extra Column for details.\r\n\r\nStyleSheet Class\r\nSee Add Extra Column for details.\r\n','14,21,9,18'); -INSERT INTO help VALUES (27,'US English','Add','Widget','You can add widgets by selecting from the Add Content pulldown menu.','0'); -INSERT INTO help VALUES (28,'US English','Add','Poll','Polls can be used to get the impressions of your users on various topics.\r\n\r\nTitle\r\nThe title of the poll. Even if you don\'t wish to display the title you should fill out this field so this poll will have a name if it is ever placed in the clipboard.\r\n\r\nDisplay the title?\r\nDo you wish to disply the title?\r\n\r\nDescription\r\nYou may provide a description for this poll, or give the user some background information.\r\n\r\nActive\r\nIf this box is checked, then users will be able to vote. Otherwise they\'ll only be able to see the results of the poll.\r\n\r\nWho can vote?\r\nChoose a group that can vote on this poll.\r\n\r\nGraph Width\r\nThe width of the poll results graph. The width is measured in pixels.\r\n\r\nQuestion\r\nWhat is the question you\'d like to ask your users?\r\n\r\nAnswers\r\nEnter the possible answers to your question. Enter only one answer per line. Polls are only capable of 20 possible answers.\r\n','14,21,19'); -INSERT INTO help VALUES (29,'US English','Edit','Poll','Title\r\nSee Add Poll for details.\r\n\r\nDisplay the title?\r\nSee Add Poll for details.\r\n\r\nDescription\r\nSee Add Poll for details.\r\n\r\nActive\r\nSee Add Poll for details.\r\n\r\nWho can vote?\r\nSee Add Poll for details.\r\n\r\nGraph Width\r\nSee Add Poll for details.\r\n\r\nQuestion\r\nSee Add Poll for details.\r\n\r\nAnswers\r\nSee Add Poll for details.\r\n','14,21,19'); -INSERT INTO help VALUES (30,'US English','Add','Site Map','Site maps are used to provide additional navigation in WebGUI. You could set up a traditional site map that would display a hierarchical view of all the pages in the site. On the other hand, you could use site maps to provide extra navigation at certain levels in your site.\r\n\r\nTitle\r\nWhat title would you give to this site map? You should fill this field out even if you don\'t wish it to be displayed.\r\n\r\nDisplay Title\r\nShould the title be displayed?\r\n\r\nDescription\r\nEnter a description as to why this site map is here and what purpose it serves.\r\n\r\nStarting from this level?\r\nIf the site map should display the page tree starting from this level, then check this box. If you wish the site map to start from the home page then uncheck it.\r\n\r\nShow only one level?\r\nShould the site map display only the current level of pages or all pages from this point forward? \r\n','14,21,19'); -INSERT INTO help VALUES (31,'US English','Edit','Site Map','Title\r\nSee Add Site Map for details.\r\n\r\nDisplay Title\r\nSee Add Site Map for details.\r\n\r\nDescription\r\nSee Add Site Map for details.\r\n\r\nStarting from this level?\r\nSee Add Site Map for details.\r\n\r\nShow only one level?\r\nSee Add Site Map for details.\r\n','14,21,19'); -INSERT INTO help VALUES (32,'US English','Add','Message Board','Message boards, also called Forums and/or Discussions, are a great way to add community to any site or intranets. Many companies use message boards internally to collaborate on projects.\r\n\r\nTitle\r\nThe name of this board.\r\n\r\nDisplay the title?\r\nDo you wish to display the title?\r\n\r\nDescription\r\nBriefly describe what should be displayed on this message board.\r\n\r\nWho can post?\r\nWhat group can post to this message board?\r\n\r\nMessages Per Page\r\nWhen a visitor first comes to a message board s/he will be presented with a listing of all the topics (aka threads) of the message board. If a board is popular, it will quickly have many topics. The messages per page attribute allows you to specify how many topics should be shown on one page.\r\n\r\nEdit Timeout\r\nHow long after a user has posted to the board will their message be available for them to edit. This timeout is measured in hours.\r\n\r\nNote: Don\'t set this limit too high. One of the great things about message boards is that they are an accurate record of a discussion. If you allow editing for a long time, then a user has a chance to go back and change his/her mind a long time after the original statement was made.\r\n','14,21,19'); -INSERT INTO help VALUES (33,'US English','Edit','Message Board','Title\r\nSee Add Message Board for details.\r\n\r\nDisplay the title?\r\nSee Add Message Board for details.\r\n\r\nDescription\r\nSee Add Message Board for details.\r\n\r\nWho can post?\r\nSee Add Message Board for details.\r\n\r\nMessages Per Page\r\nSee Add Message Board for details.\r\n\r\nEdit Timeout\r\nSee Add Message Board for details.\r\n','14,21,19'); -INSERT INTO help VALUES (34,'US English','Add','Link List','Link lists are just what they sound like, a list of links. Many sites have a links section, and this just automates the process.\r\n\r\nTitle\r\nWhat is the title of this link list?\r\n\r\nDisplay the title?\r\nDo you wish to display the title of this list?\r\n\r\nProcess macros?\r\nDo you wish to process macros on the contents of this link list? Turning this off will increase performance slightly on busy sites.\r\n\r\nDescription\r\nDescribe the purpose of the links in this list.','14,21,19'); -INSERT INTO help VALUES (35,'US English','Edit','Link List','Title\r\nSee Add Link List for details.\r\n\r\nDisplay the title?\r\nSee Add Link List for details.\r\n\r\nProcess macros?\r\nSee Add Link List for details.\r\n\r\nDescription\r\nSee Add Link List for details.\r\n\r\nAdding / Editing Links\r\nYou\'ll notice at the bottom of the Edit screen that there are some options to add, edit, delete and reorder the links in your link lists. This process works exactly as the process for doing the same with widgets and pages. The three properties of links are name, url, and description.\r\n','14,21,19'); -INSERT INTO help VALUES (36,'US English','Add','Syndicated Content','Syndicated content is content that is pulled from another site using the RDF/RSS specification. This technology is often used to pull headlines from various news sites like CNN and Slashdot. It can, of course, be used for other things like sports scores, stock market info, etc.\r\n\r\nYou can find a list of syndicated content at http://my.userland.com. You will need to register with an account to browse their listing of content. Also, the list contained there is by no means a complete list of all the syndicated content on the internet.\r\n\r\nTitle\r\nWhat is the title for this content? This is often the title of the site that the content comes from.\r\n\r\nDisplay the title?\r\nDo you wish to display the title?\r\n\r\nDescription\r\nBriefly describe the content being pulled so that your users will know what they are seeing.\r\n\r\nURL to RSS file\r\nProvide the exact URL (starting with http://) to the syndicated content\'s RDF or RSS file. The syndicated content will be downloaded from this URL hourly.','14,21'); -INSERT INTO help VALUES (37,'US English','Edit','Syndicated Content','Title\r\nSee Add Syndicated Content for details.\r\n\r\nDisplay the title?\r\nSee Add Syndicated Content for details.\r\n\r\nDescription\r\nSee Add Syndicated Content for details.\r\n\r\nURL to RSS file\r\nSee Add Syndicated Content for details.\r\n','14,21'); -INSERT INTO help VALUES (38,'US English','Add','Events Calendar','Events calendars are used on many intranets to keep track of internal dates that affect a whole organization. Also events calendars on consumer sites are a great way to let your customers know what events you\'ll be attending and what promotions you\'ll be having.\r\n\r\nTitle\r\nWhat is the title of this events calendar?\r\n\r\nDisplay the title?\r\nDo you want the title to be displayed?\r\n\r\nProcess macros?\r\nDo you wish to process WebGUI macros in the content of the events calendar? Turning this off can increase performance on busy sites.\r\n\r\nDescription\r\nBriefly describe what this events calendar details.\r\n','14,21,19'); -INSERT INTO help VALUES (39,'US English','Edit','Events Calendar','Title\r\nSee Add Events Calendar for details.\r\n\r\nDisplay the title?\r\nSee Add Events Calendar for details.\r\n\r\nProcess macros?\r\nSee Add Events Calendar for details.\r\n\r\nDescription\r\nSee Add Events Calendar for details.\r\n\r\nAdd / Edit Events\r\nOn the edit screen you\'ll notice that there are options to add, edit, and delete the events in your events calendar. The properties for events are name, description, start date, and end date.\r\n\r\nNote: Events that have already happened will not be displayed on the events calendar.','14,21,19'); -INSERT INTO help VALUES (40,'US English','Add','F.A.Q.','It seems that almost every web site, intranet, and extranet in the world has a frequently asked questions area. This widget helps you build one too.\r\n\r\nTitle\r\nWhat is the title for this FAQ section?\r\n\r\nDisplay the title?\r\nDo you wish to display the title?\r\n\r\nProcess macros?\r\nDo you wish to process macros contained in the FAQ content? Turning this off will increase performance on busy sites.\r\n\r\nDescription\r\nBriefly describe what this FAQ covers.\r\n','14,21,19'); -INSERT INTO help VALUES (41,'US English','Edit','F.A.Q.','Title\r\nSee Add F.A.Q. for details.\r\n\r\nDisplay the title?\r\nSee Add F.A.Q. for details.\r\n\r\nProcess macros?\r\nSee Add F.A.Q. for details.\r\n\r\nDescription\r\nSee Add F.A.Q. for details.\r\n\r\nAdd / Edit Questions\r\nOn the edit screen you\'ll notice options for adding, editing, deleting, and reordering the questions in your FAQ. The two properties of FAQ questions are question and answer.\r\n\r\n','14,21,19'); -INSERT INTO help VALUES (42,'US English','Add','Search (MnoGo)','The Mno Go Search engine is one of the most popular and powerful open-source search engines on the market. It is so good that we figured that there was no reason to reinvent the wheel so we incorperated it into WebGUI.\r\n\r\nTitle\r\nWhat is the title of this search?\r\n\r\nDisplay the title?\r\nDo you want to display the title?\r\n\r\nDescription\r\nBriefly describe what is available through this search engine.\r\n\r\nDSN\r\nData Source Name is the unique identifier that Perl uses to describe the location of your database. It takes the format of DBI:[driver]:[database name]:[host]. This DSN needs to point to where your Mno Go Indexer stored the spider results. If you are uncertain how to set up the Mno Go Search Engine and Indexer Plain Black Software provides support and training services.\r\n\r\nExample: DBI:mysql:WebGUI:localhost\r\n\r\nDatabase User\r\nThe username you use to connect to the DSN.\r\n\r\nDatabase Password\r\nThe password you use to connect to the DSN.\r\n','14,21'); -INSERT INTO help VALUES (43,'US English','Edit','Search (MnoGo)','Title\r\nSee Add Search (MnoGo) for details.\r\n\r\nDisplay the title?\r\nSee Add Search (MnoGo) for details.\r\n\r\nDescription\r\nSee Add Search (MnoGo) for details.\r\n\r\nDSN\r\nSee Add Search (MnoGo) for details.\r\n\r\nDatabase User\r\nSee Add Search (MnoGo) for details.\r\n\r\nDatabase Password\r\nSee Add Search (MnoGo) for details.\r\n','14,21'); -INSERT INTO help VALUES (44,'US English','Add','User Submission System','User submission systems are a great way to add a sense of community to any site as well as get free content from your users.\r\n\r\nTitle\r\nWhat is the title for this user submission system?\r\n\r\nDisplay the title?\r\nWould you like the title displayed?\r\n\r\nDescription\r\nBriefly describe why this user submission system is here and what should be submitted to it.\r\n\r\nWho can contribute?\r\nWhat group is allowed to contribute content?\r\n\r\nSubmissions Per Page\r\nHow many submissions should be listed per page in the submissions index?\r\n\r\nDefault Status\r\nShould submissions be set to approved, pending, or denied by default?\r\n\r\nNote: If you set the default status to pending, then be prepared to monitor the pending queue under the Admin menu.\r\n','14,21'); -INSERT INTO help VALUES (45,'US English','Edit','User Submission System','Title\r\nSee Add User Submission System for details.\r\n\r\nDisplay the title?\r\nSee Add User Submission System for details.\r\n\r\nDescription\r\nSee Add User Submission System for details.\r\n\r\nWho can contribute?\r\nSee Add User Submission System for details.\r\n\r\nSubmissions Per Page\r\nSee Add User Submission System for details.\r\n\r\nDefault Status\r\nSee Add User Submission System for details.\r\n','14,21'); -INSERT INTO help VALUES (46,'US English','Empty','Trash','If you choose to empty your trash, any items contained in it will be lost forever. If you\'re unsure about a few items, it might be best to cut them to your clipboard before you empty the trash.','0'); - -INSERT INTO settings VALUES ('ldapURL','ldap://ldap.mycompany.com:389/o=MyCompany'); -INSERT INTO settings VALUES ('ldapId','shortname'); -INSERT INTO settings VALUES ('ldapIdName','LDAP Shortname'); -INSERT INTO settings VALUES ('ldapPasswordName','LDAP Password'); -INSERT INTO settings VALUES ('authMethod','WebGUI'); - -alter table user add column authMethod varchar(30) NOT NULL default 'WebGUI'; -alter table user add column ldapURL text; -alter table user add column connectDN varchar(255) default NULL; - diff --git a/docs/upgrade_1.1.0-1.2.0.pl b/docs/upgrade_1.1.0-1.2.0.pl new file mode 100755 index 000000000..8b31aa7d8 --- /dev/null +++ b/docs/upgrade_1.1.0-1.2.0.pl @@ -0,0 +1,151 @@ +#!/usr/bin/perl + +#------------------------------------------------------------------- +# WebGUI is Copyright 2001 Plain Black Software. +#------------------------------------------------------------------- +# 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 +#------------------------------------------------------------------- + +BEGIN { + unshift (@INC, "../lib"); +} + +use Data::Config; +use DBI; +use strict; +use WebGUI::DateTime; +use WebGUI::SQL; + +my ($dbh, $config, $sth, @data); + +if ($ARGV[0] ne "--GO") { + print <connect($config->param('dsn'), $config->param('dbuser'), $config->param('dbpass'))}) { + print "OK\n"; + print "Renaming tables:\t"; + WebGUI::SQL->write("alter table user rename users",$dbh); + print "Done\n"; + print "Creating new columns:\t"; + WebGUI::SQL->write("alter table Article add column startDate_upgrade int after startDate",$dbh); + WebGUI::SQL->write("alter table Article add column endDate_upgrade int after endDate",$dbh); + WebGUI::SQL->write("alter table SyndicatedContent add column lastFetched_upgrade int after lastFetched",$dbh); + WebGUI::SQL->write("alter table event add column startDate_upgrade int after startDate",$dbh); + WebGUI::SQL->write("alter table event add column endDate_upgrade int after endDate",$dbh); + WebGUI::SQL->write("alter table message add column dateOfPost_upgrade int after dateOfPost",$dbh); + WebGUI::SQL->write("alter table session add column expires_upgrade int after expires",$dbh); + WebGUI::SQL->write("alter table session add column lastPageView_upgrade int after lastPageView",$dbh); + WebGUI::SQL->write("alter table submission add column dateSubmitted_upgrade int after dateSubmitted",$dbh); + WebGUI::SQL->write("alter table widget add column dateAdded_upgrade int after dateAdded",$dbh); + WebGUI::SQL->write("alter table widget add column lastEdited_upgrade int after lastEdited",$dbh); + print "Done\n"; + print "Migrating data:\t\t"; + WebGUI::SQL->write("update Article set endDate='2037-01-01 00:00:00' where endDate='2100-01-01 00:00:00'",$dbh); + $sth = WebGUI::SQL->read("select widgetId, unix_timestamp(startDate), unix_timestamp(endDate) from Article",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update Article set startDate_upgrade='$data[1]', endDate_upgrade='$data[2]' where widgetId=$data[0]",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select widgetId, unix_timestamp(lastFetched) from SyndicatedContent",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update SyndicatedContent set lastFetched_upgrade='$data[1]' where widgetId=$data[0]",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select eventId, unix_timestamp(startDate), unix_timestamp(endDate) from event",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update event set startDate_upgrade='$data[1]', endDate_upgrade='$data[2]' where eventId=$data[0]",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select messageId, unix_timestamp(dateOfPost) from message",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update message set dateOfPost_upgrade='$data[1]' where messageId=$data[0]",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select sessionId, unix_timestamp(expires), unix_timestamp(lastPageView) from session",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update session set expires_upgrade='$data[1]', lastPageView_upgrade='$data[2]' where sessionId=".$dbh->quote($data[0])."",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select submissionId, unix_timestamp(dateSubmitted) from submission",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update submission set dateSubmitted_upgrade='$data[1]' where widgetId=$data[0]",$dbh); + } + $sth->finish; + $sth = WebGUI::SQL->read("select widgetId, unix_timestamp(dateAdded), unix_timestamp(lastEdited) from widget",$dbh); + while (@data = $sth->array) { + WebGUI::SQL->write("update widget set dateAdded_upgrade='$data[1]', lastEdited='$data[2]' where widgetId=$data[0]",$dbh); + } + $sth->finish; + print "Done\n"; + print "Discarding old columns:\t"; + WebGUI::SQL->write("alter table Article drop column startDate",$dbh); + WebGUI::SQL->write("alter table Article drop column endDate",$dbh); + WebGUI::SQL->write("alter table SyndicatedContent drop column lastFetched",$dbh); + WebGUI::SQL->write("alter table event drop column startDate",$dbh); + WebGUI::SQL->write("alter table event drop column endDate",$dbh); + WebGUI::SQL->write("alter table message drop column dateOfPost",$dbh); + WebGUI::SQL->write("alter table session drop column expires",$dbh); + WebGUI::SQL->write("alter table session drop column lastPageView",$dbh); + WebGUI::SQL->write("alter table submission drop column dateSubmitted",$dbh); + WebGUI::SQL->write("alter table widget drop column dateAdded",$dbh); + WebGUI::SQL->write("alter table widget drop column lastEdited",$dbh); + print "Done\n"; + print "Renaming columns:\t"; + WebGUI::SQL->write("alter table Article change column startDate_upgrade startDate int",$dbh); + WebGUI::SQL->write("alter table Article change column endDate_upgrade endDate int",$dbh); + WebGUI::SQL->write("alter table SyndicatedContent change column lastFetched_upgrade lastFetched int",$dbh); + WebGUI::SQL->write("alter table event change column startDate_upgrade startDate int",$dbh); + WebGUI::SQL->write("alter table event change column endDate_upgrade endDate int",$dbh); + WebGUI::SQL->write("alter table message change column dateOfPost_upgrade dateOfPost int",$dbh); + WebGUI::SQL->write("alter table session change column expires_upgrade expires int",$dbh); + WebGUI::SQL->write("alter table session change column lastPageView_upgrade lastPageView int",$dbh); + WebGUI::SQL->write("alter table submission change column dateSubmitted_upgrade dateSubmitted int",$dbh); + WebGUI::SQL->write("alter table widget change column dateAdded_upgrade dateAdded int",$dbh); + WebGUI::SQL->write("alter table widget change column lastEdited_upgrade lastEdited int",$dbh); + print "Done\n"; + print "Cleaning up:\t\t"; + $dbh->disconnect(); + print "Done\n"; + print "\nUpgrade complete!\n"; + } else { + print "Can't connect with info provided.\n"; + } +} else { + print "Ouch...something went wrong!"; +} + + + + diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index e492060fe..2ca523df0 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -1,5 +1,5 @@ package WebGUI; -our $VERSION = "1.1.0"; +our $VERSION = "1.2.0"; #------------------------------------------------------------------- # WebGUI is Copyright 2001 Plain Black Software. @@ -129,7 +129,6 @@ sub page { } elsif ($functionOutput ne "") { $content = $functionOutput; } else { - #if (WebGUI::Privilege::canViewPage($session{page}{pageId})) { if (WebGUI::Privilege::canViewPage()) { if ($session{var}{adminOn}) { $content .= ''; diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm new file mode 100644 index 000000000..467396ded --- /dev/null +++ b/lib/WebGUI/DateTime.pm @@ -0,0 +1,124 @@ +package WebGUI::DateTime; + +#------------------------------------------------------------------- +# WebGUI is Copyright 2001 Plain Black Software. +#------------------------------------------------------------------- +# 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 +#------------------------------------------------------------------- + +use Exporter; +use strict; +use Time::Local; + +our @ISA = qw(Exporter); +our @EXPORT = qw(&epochToHuman &epochToSet &humanToEpoch &setToEpoch); +our %month = ( + 1=> "January", + 2=> "February", + 3=> "March", + 4=> "April", + 5=> "May", + 6=> "June", + 7=> "July", + 8=> "August", + 9=> "September", + 10=> "October", + 11=> "November", + 12=> "December" + ); +our %weekday = ( + 1=> "Sunday", + 2=> "Monday", + 3=> "Tuesday", + 4=> "Wednesday", + 5=> "Thursday", + 6=> "Friday", + 7=> "Saturday" + ); + +#------------------------------------------------------------------- +sub epochToHuman { + my ($hour12, $value, $output, @date); + @date = localtime($_[0]); + $date[4]++; # offset the months starting from 0 + $date[5] += 1900; # original value is Year-1900 + $date[6]++; # offset for weekdays starting from 0 + $output = $_[1]; + #---dealing with percent symbol + $output =~ s/\%\%/\%/g; + #---year stuff + $output =~ s/\%y/$date[5]/g; + $value = substr($date[5],2,2); + $output =~ s/\%Y/$value/g; + #---month stuff + $value = sprintf("%02d",$date[4]); + $output =~ s/\%m/$value/g; + $output =~ s/\%M/$date[4]/g; + $output =~ s/\%c/$month{$date[4]}/g; + #---day stuff + $value = sprintf("%02d",$date[3]); + $output =~ s/\%d/$value/g; + $output =~ s/\%D/$date[3]/g; + $output =~ s/\%w/$weekday{$date[6]}/g; + #---hour stuff + $hour12 = $date[2]+1; + if ($hour12 > 12) { + $hour12 = $hour12 - 12; + } + $value = sprintf("%02d",$hour12); + $output =~ s/\%h/$value/g; + $output =~ s/\%H/$hour12/g; + $value = sprintf("%02d",$date[2]); + $output =~ s/\%j/$value/g; + $output =~ s/\%J/$date[2]/g; + if ($date[2] > 11) { + $output =~ s/\%p/pm/g; + $output =~ s/\%P/PM/g; + } else { + $output =~ s/\%p/am/g; + $output =~ s/\%P/AM/g; + } + #---minute stuff + $value = sprintf("%02d",$date[1]); + $output =~ s/\%n/$value/g; + #---second stuff + $value = sprintf("%02d",$date[0]); + $output =~ s/\%s/$value/g; + return $output; +} + +#------------------------------------------------------------------- +sub epochToSet { + return epochToHuman($_[0],"%m/%d/%y"); +} + +#------------------------------------------------------------------- +# eg: humanToEpoch(YYYY-MM-DD HH:MM:SS) +sub humanToEpoch { + my (@temp, $dateString, $timeString, $output, @date); + ($dateString,$timeString) = split(/ /,$_[0]); + @temp = split(/-/,$dateString); + $date[5] = $temp[0]-1900; + $date[4] = $temp[1]-1; + $date[3] = $temp[2]+0; + @temp = split(/:/,$timeString); + $date[2] = $temp[0]+0; + $date[1] = $temp[1]+0; + $date[0] = $temp[2]+0; + $output = timelocal(@date); + return $output; +} + +#------------------------------------------------------------------- +sub setToEpoch { + my ($month, $day, $year) = split(/\//,$_[0]); + return humanToEpoch($year.'-'.$month.'-'.$day.' 00:00:00'); +} + + + +1; diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm index 35c4aeeff..4b5c26da2 100644 --- a/lib/WebGUI/Operation/Account.pm +++ b/lib/WebGUI/Operation/Account.pm @@ -37,7 +37,7 @@ sub _hasBadPassword { #------------------------------------------------------------------- sub _hasBadUsername { my ($otherUser); - ($otherUser) = WebGUI::SQL->quickArray("select username from user where lcase(username)=lcase('$_[0]')",$session{dbh}); + ($otherUser) = WebGUI::SQL->quickArray("select username from users where lcase(username)=lcase('$_[0]')",$session{dbh}); if (($otherUser ne "" && $otherUser ne $session{user}{username}) || $_[0] eq "") { return 1; } else { @@ -104,7 +104,7 @@ sub www_deactivateAccount { #------------------------------------------------------------------- sub www_deactivateAccountConfirm { if ($session{user}{userId} != 1) { - WebGUI::SQL->write("delete from user where userId=$session{user}{userId}",$session{dbh}); + WebGUI::SQL->write("delete from users where userId=$session{user}{userId}",$session{dbh}); WebGUI::SQL->write("delete from groupings where userId=$session{user}{userId}",$session{dbh}); WebGUI::Session::end($session{var}{sessionId}); _login(1,"null"); @@ -169,7 +169,7 @@ sub www_displayLogin { #------------------------------------------------------------------- sub www_login { my ($uri, $port, $ldap, %args, $auth, $error, $uid,$pass,$authMethod, $ldapURL, $connectDN, $success); - ($uid,$pass,$authMethod, $ldapURL, $connectDN) = WebGUI::SQL->quickArray("select userId,identifier,authMethod,ldapURL,connectDN from user where username=".quote($session{form}{username}),$session{dbh}); + ($uid,$pass,$authMethod, $ldapURL, $connectDN) = WebGUI::SQL->quickArray("select userId,identifier,authMethod,ldapURL,connectDN from users where username=".quote($session{form}{username}),$session{dbh}); if ($authMethod eq "LDAP") { $uri = URI->new($ldapURL); if ($uri->port < 1) { @@ -232,13 +232,13 @@ sub www_recoverPassword { #------------------------------------------------------------------- sub www_recoverPasswordFinish { my ($sth, $username, $encryptedPassword, $userId, $password, $flag, $message, $output); - $sth = WebGUI::SQL->read("select username, userId from user where email=".quote($session{form}{email}),$session{dbh}); + $sth = WebGUI::SQL->read("select username, userId from users where email=".quote($session{form}{email}),$session{dbh}); while (($username,$userId) = $sth->array) { foreach (0,1,2,3,4,5) { $password .= chr(ord('A') + randint(32)); } $encryptedPassword = Digest::MD5::md5_base64($password); - WebGUI::SQL->write("update user set identifier='$encryptedPassword' where userId='$userId'",$session{dbh}); + WebGUI::SQL->write("update users set identifier='$encryptedPassword' where userId='$userId'",$session{dbh}); $flag = 1; $message = 'Someone (probably you) requested your account information be sent. Your password has been reset. The following information represents your new account information:\nUser: '.$username.'\nPass: '.$password.'\n'; WebGUI::Mail::send($session{form}{email},"Account Information",$message); @@ -288,8 +288,8 @@ sub www_saveAccount { if ($error eq "") { $encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1}); $uid = getNextId("userId"); - WebGUI::SQL->write("insert into user set userId=$uid, username=".quote($session{form}{username}).", identifier=".quote($encryptedPassword).", authMethod=".quote($session{setting}{authMethod}).", ldapURL=".quote($session{setting}{ldapURL}).", connectDN=".quote($connectDN).", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq}),$session{dbh}); - WebGUI::SQL->write("insert into groupings set groupId=2,userId=$uid",$session{dbh}); + WebGUI::SQL->write("insert into users values ($uid, ".quote($session{form}{username}).", ".quote($encryptedPassword).", ".quote($session{form}{email}).", ".quote($session{form}{icq}).", ".quote($session{setting}{authMethod}).", ".quote($session{setting}{ldapURL}).", ".quote($connectDN).")",$session{dbh}); + WebGUI::SQL->write("insert into groupings values (2,$uid)",$session{dbh}); _login($uid,$encryptedPassword); $output .= 'Account created successfully!

'; $output .= www_displayAccount(); @@ -315,7 +315,7 @@ sub www_updateAccount { } if ($error eq "") { $encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1}); - WebGUI::SQL->write("update user set username=".quote($session{form}{username}).$passwordStatement.", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq})." where userId=".$session{user}{userId},$session{dbh}); + WebGUI::SQL->write("update users set username=".quote($session{form}{username}).$passwordStatement.", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq})." where userId=".$session{user}{userId},$session{dbh}); if ($passwordStatement ne "") { _login($session{user}{userId},$encryptedPassword); } diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index e6bd6644e..08c70953c 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -43,7 +43,7 @@ sub www_addGroup { sub www_addGroupSave { my ($output); if ($session{var}{sessionId}) { - WebGUI::SQL->write("insert into groups set groupId=".getNextId("groupId").", groupName=".quote($session{form}{groupName}).", description=".quote($session{form}{description}),$session{dbh}); + WebGUI::SQL->write("insert into groups values (".getNextId("groupId").", ".quote($session{form}{groupName}).", ".quote($session{form}{description}).")",$session{dbh}); $output = www_listGroups(); } else { $output = WebGUI::Privilege::insufficient(); @@ -89,7 +89,7 @@ sub www_editGroup { $output .= 'Description'.WebGUI::Form::textArea("description",$group{description}).''; $output .= ''.WebGUI::Form::submit("save").''; $output .= 'Users In Group'; - $sth = WebGUI::SQL->read("select user.username from user,groupings where groupings.groupId=$session{form}{gid} and groupings.userId=user.userId order by user.username",$session{dbh}); + $sth = WebGUI::SQL->read("select users.username from users,groupings where groupings.groupId=$session{form}{gid} and groupings.userId=users.userId order by users.username",$session{dbh}); while (($user) = $sth->array) { $output .= $user."
"; } diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm index c1447d5cb..6ad0602d0 100644 --- a/lib/WebGUI/Operation/Page.pm +++ b/lib/WebGUI/Operation/Page.pm @@ -80,7 +80,7 @@ sub www_addPageSave { while (($test) = WebGUI::SQL->quickArray("select urlizedTitle from page where urlizedTitle='$urlizedTitle'",$session{dbh})) { $urlizedTitle .= 2; } - WebGUI::SQL->write("insert into page set pageId=".getNextId("pageId").", parentId=$session{page}{pageId}, title=".quote($session{form}{title}).", styleId=$session{page}{styleId}, sequenceNumber='$nextSeq', ownerId=$session{user}{userId}, ownerView=$session{page}{ownerView}, ownerEdit=$session{page}{ownerEdit}, groupId='$session{page}{groupId}', groupView=$session{page}{groupView}, groupEdit=$session{page}{groupEdit}, worldView=$session{page}{worldView}, worldEdit=$session{page}{worldEdit}, metaTags=".quote($session{form}{metaTags}).", urlizedTitle='$urlizedTitle'",$session{dbh}); + WebGUI::SQL->write("insert into page values (".getNextId("pageId").", $session{page}{pageId}, ".quote($session{form}{title}).", $session{page}{styleId}, $session{user}{userId}, $session{page}{ownerView}, $session{page}{ownerEdit}, $session{page}{groupId}, $session{page}{groupView}, $session{page}{groupEdit}, $session{page}{worldView}, $session{page}{worldEdit}, '$nextSeq', ".quote($session{form}{metaTags}).", '$urlizedTitle')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -140,7 +140,7 @@ sub www_editPage { $array[0] = $session{page}{styleId}; $output .= 'Style'.WebGUI::Form::selectList("styleId",\%hash,\@array).' '.WebGUI::Form::checkbox("recurseStyle","yes").' Check to give this style to all sub-pages.'; $output .= 'Page URL'.WebGUI::Form::text("urlizedTitle",20,30,$session{page}{urlizedTitle}).''; - %hash = WebGUI::SQL->buildHash("select user.userId,user.username from user,groupings where groupings.groupId=4 and groupings.userId=user.userId order by user.username",$session{dbh}); + %hash = WebGUI::SQL->buildHash("select users.userId,users.username from users,groupings where groupings.groupId=4 and groupings.userId=users.userId order by users.username",$session{dbh}); $array[0] = $session{page}{ownerId}; $output .= 'Owner'.WebGUI::Form::selectList("ownerId",\%hash,\@array).' '.WebGUI::Form::checkbox("recursePrivs","yes").' Check to give these privileges to all sub-pages.'; $array[0] = $session{page}{ownerView}; diff --git a/lib/WebGUI/Operation/Style.pm b/lib/WebGUI/Operation/Style.pm index d5704c69b..ab166e3bd 100644 --- a/lib/WebGUI/Operation/Style.pm +++ b/lib/WebGUI/Operation/Style.pm @@ -45,7 +45,7 @@ sub www_addStyle { sub www_addStyleSave { my ($output); if (WebGUI::Privilege::isInGroup(3)) { - WebGUI::SQL->write("insert into style set styleId=".getNextId("styleId").", name=".quote($session{form}{name}).", header=".quote($session{form}{header}).", footer=".quote($session{form}{footer}).", styleSheet=".quote($session{form}{styleSheet}),$session{dbh}); + WebGUI::SQL->write("insert into style values (".getNextId("styleId").", ".quote($session{form}{name}).", ".quote($session{form}{header}).", ".quote($session{form}{footer}).", ".quote($session{form}{styleSheet}).")",$session{dbh}); $output = www_listStyles(); } else { $output = WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Operation/Submission.pm b/lib/WebGUI/Operation/Submission.pm index 6f78db0d4..77dab5361 100644 --- a/lib/WebGUI/Operation/Submission.pm +++ b/lib/WebGUI/Operation/Submission.pm @@ -12,6 +12,7 @@ package WebGUI::Operation::Submission; use Exporter; use strict; +use WebGUI::DateTime; use WebGUI::Privilege; use WebGUI::Session; use WebGUI::SQL; @@ -46,9 +47,9 @@ sub www_viewPendingSubmissions { my (@submission, $output, $sth, @row, $i, $pn); if (WebGUI::Privilege::isInGroup(4,$session{user}{userId}) || WebGUI::Privilege::isInGroup(3,$session{user}{userId})) { $output = '

Pending Sumissions

'; - $sth = WebGUI::SQL->read("select title,submissionId,date_format(dateSubmitted,'%c/%e %l:%i%p'),username,userId,widgetId from submission where status='Pending' order by dateSubmitted",$session{dbh}); + $sth = WebGUI::SQL->read("select title,submissionId,dateSubmitted,username,userId,widgetId from submission where status='Pending' order by dateSubmitted",$session{dbh}); while (@submission = $sth->array) { - $row[$i] = ''.$submission[0].''.$submission[2].''.$submission[3].''; + $row[$i] = ''.$submission[0].''.epochToHuman($submission[2],"%m/%d/%Y").''.$submission[3].''; $i++; } $sth->finish; diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 32204ca9e..b2ec224d5 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -53,15 +53,14 @@ sub www_addUser { #------------------------------------------------------------------- sub www_addUserSave { - my ($output, @groups, $uid, $gid, $encryptedPassword, $passwordStatement); + my ($output, @groups, $uid, $gid, $encryptedPassword); if (WebGUI::Privilege::isInGroup(3)) { $encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier}); - $passwordStatement = ', identifier='.quote($encryptedPassword); $uid = getNextId("userId"); - WebGUI::SQL->write("insert into user set userId=$uid, username=".quote($session{form}{username}).$passwordStatement.", authMethod=".quote($session{form}{authMethod}).", ldapURL=".quote($session{form}{ldapURL}).", connectDN=".quote($session{form}{connectDN}).", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq}),$session{dbh}); + WebGUI::SQL->write("insert into users values ($uid, ".quote($session{form}{username}).", ".quote($encryptedPassword).", ".quote($session{form}{email}).", ".quote($session{form}{icq}).", ".quote($session{form}{authMethod}).", ".quote($session{form}{ldapURL}).", ".quote($session{form}{connectDN}).")",$session{dbh}); @groups = $session{cgi}->param('groups'); foreach $gid (@groups) { - WebGUI::SQL->write("insert into groupings set groupId=$gid, userId=$uid",$session{dbh}); + WebGUI::SQL->write("insert into groupings values ($gid, $uid)",$session{dbh}); } $output = www_listUsers(); } else { @@ -87,7 +86,7 @@ sub www_deleteUser { #------------------------------------------------------------------- sub www_deleteUserConfirm { if (WebGUI::Privilege::isInGroup(3) && $session{form}{uid} > 25) { - WebGUI::SQL->write("delete from user where userId=$session{form}{uid}",$session{dbh}); + WebGUI::SQL->write("delete from users where userId=$session{form}{uid}",$session{dbh}); WebGUI::SQL->write("delete from groupings where userId=$session{form}{uid}",$session{dbh}); return www_listUsers(); } else { @@ -99,7 +98,7 @@ sub www_deleteUserConfirm { sub www_editUser { my ($output, %user, %hash, @array); if (WebGUI::Privilege::isInGroup(3)) { - %user = WebGUI::SQL->quickHash("select * from user where userId=$session{form}{uid}",$session{dbh}); + %user = WebGUI::SQL->quickHash("select * from users where userId=$session{form}{uid}",$session{dbh}); $output .= '

Edit User

'; $output .= WebGUI::Form::hidden("op","editUserSave"); $output .= WebGUI::Form::hidden("uid",$session{form}{uid}); @@ -134,11 +133,11 @@ sub www_editUserSave { $passwordStatement = ', identifier='.quote($encryptedPassword); } $encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1}); - WebGUI::SQL->write("update user set username=".quote($session{form}{username}).$passwordStatement.", authMethod=".quote($session{form}{authMethod}).", ldapURL=".quote($session{form}{ldapURL}).", connectDN=".quote($session{form}{connectDN}).", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq})." where userId=".$session{form}{uid},$session{dbh}); + WebGUI::SQL->write("update users set username=".quote($session{form}{username}).$passwordStatement.", authMethod=".quote($session{form}{authMethod}).", ldapURL=".quote($session{form}{ldapURL}).", connectDN=".quote($session{form}{connectDN}).", email=".quote($session{form}{email}).", icq=".quote($session{form}{icq})." where userId=".$session{form}{uid},$session{dbh}); WebGUI::SQL->write("delete from groupings where userId=$session{form}{uid}",$session{dbh}); @groups = $session{cgi}->param('groups'); foreach $gid (@groups) { - WebGUI::SQL->write("insert into groupings set groupId=$gid, userId=$session{form}{uid}",$session{dbh}); + WebGUI::SQL->write("insert into groupings values ($gid, $session{form}{uid})",$session{dbh}); } return www_listUsers(); } else { @@ -154,7 +153,7 @@ sub www_listUsers { $output = '

Users

'; $output .= ''; $output .= ''; - $sth = WebGUI::SQL->read("select userId,username,email from user where username<>'Reserved' order by username",$session{dbh}); + $sth = WebGUI::SQL->read("select userId,username,email from users where username<>'Reserved' order by username",$session{dbh}); while (@data = $sth->array) { $row[$i] = ''; #$row[$i] .= ''; diff --git a/lib/WebGUI/Privilege.pm b/lib/WebGUI/Privilege.pm index 239125ba6..32a658e50 100644 --- a/lib/WebGUI/Privilege.pm +++ b/lib/WebGUI/Privilege.pm @@ -63,7 +63,7 @@ sub isInGroup { if ($uid eq "") { $uid = $session{user}{userId}; } - ($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId='$gid' && userId='$uid'",$session{dbh}); + ($result) = WebGUI::SQL->quickArray("select count(*) from groupings where groupId='$gid' and userId='$uid'",$session{dbh}); if ($result < 1 && $gid == 1) { # registered users can $result = isInGroup(2, $uid); # do anything visitors } # can do diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index 536ec3d78..a3cf95aca 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -48,7 +48,7 @@ sub _getSessionVars { if ($_[0] ne "") { %vars = WebGUI::SQL->quickHash("select * from session where sessionId='$_[0]'", $_[1]); if ($vars{sessionId} ne "") { - WebGUI::SQL->write("update session set lastPageView=now(), lastIP='$ENV{REMOTE_ADDR}', expires=date_add(now(),interval $_[2] second) where sessionId='$_[0]'",$_[1]); + WebGUI::SQL->write("update session set lastPageView=".time().", lastIP='$ENV{REMOTE_ADDR}', expires=".(time()+$_[2])." where sessionId='$_[0]'",$_[1]); } } return %vars; @@ -62,9 +62,9 @@ sub _getUserInfo { } else { $uid = 1; } - %user = WebGUI::SQL->quickHash("select * from user where userId='$uid'", $_[1]); + %user = WebGUI::SQL->quickHash("select * from users where userId='$uid'", $_[1]); if ($user{userId} eq "") { - %user = _getUserInfo(1,$_[1]); + %user = _getUserInfo("1|none",$_[1]); } return %user; } @@ -157,9 +157,9 @@ sub setCookie { sub start { my (%user, $uid, $encryptedPassword); ($uid, $encryptedPassword) = split(/\|/,$_[0]); - %user = WebGUI::SQL->quickHash("select * from user where userId='$uid'", $session{dbh}); + %user = WebGUI::SQL->quickHash("select * from users where userId='$uid'", $session{dbh}); if (crypt($user{identifier},"yJ") eq $encryptedPassword) { - WebGUI::SQL->write("insert into session set sessionId='$_[0]', expires=date_add(now(),interval $session{setting}{sessionTimeout} second)",$session{dbh}); + WebGUI::SQL->write("insert into session values ('$_[0]', ".(time()+$session{setting}{sessionTimeout}).", ".time().", 0, '$ENV{REMOTE_ADDR}')",$session{dbh}); refreshSessionVars($_[0]); return 1; } else { diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm index 09f6c8723..7fb5bf54b 100644 --- a/lib/WebGUI/Style.pm +++ b/lib/WebGUI/Style.pm @@ -23,14 +23,17 @@ sub getStyle { $footer = ''; } else { %style = WebGUI::SQL->quickHash("select header,footer,styleSheet from style where styleId=$session{page}{styleId}",$session{dbh}); - $header = ' - + $header = ' + - '.$session{page}{title}.''.$style{styleSheet}.$session{page}{metaTags}.' + '.$session{page}{title}.' + '.$style{styleSheet}.' + '.$session{page}{metaTags}.' '.$style{header}; - $footer = $style{footer}.''; + $footer = $style{footer}.' + '; $header = WebGUI::Macro::process($header); $footer = WebGUI::Macro::process($footer); } diff --git a/lib/WebGUI/Utility.pm b/lib/WebGUI/Utility.pm index 3d206af93..14e468296 100644 --- a/lib/WebGUI/Utility.pm +++ b/lib/WebGUI/Utility.pm @@ -18,7 +18,7 @@ use WebGUI::Session; use WebGUI::SQL; our @ISA = qw(Exporter); -our @EXPORT = qw(&getNextId &saveAttachment &humanToMysqlDate &round &urlizeTitle "e); +our @EXPORT = qw(&getNextId &saveAttachment &round &urlizeTitle "e); #------------------------------------------------------------------- sub getNextId { @@ -28,12 +28,6 @@ sub getNextId { return $id; } -#------------------------------------------------------------------- -sub humanToMysqlDate { - my ($month, $day, $year) = split(/\//,$_[0]); - return $year.'-'.$month.'-'.$day.' 00:00:00'; -} - #------------------------------------------------------------------- # This is here simply to make typing shorter, cuz I'm lazy. sub quote { diff --git a/lib/WebGUI/Widget.pm b/lib/WebGUI/Widget.pm index 0b07df129..8b720f581 100644 --- a/lib/WebGUI/Widget.pm +++ b/lib/WebGUI/Widget.pm @@ -37,13 +37,13 @@ sub create { my ($widgetId, $nextSeq); $widgetId = getNextId("widgetId"); ($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from widget where pageId=$session{page}{pageId}",$session{dbh}); - WebGUI::SQL->write("insert into widget set widgetId=$widgetId, pageId=$session{page}{pageId}, widgetType='$session{form}{widget}', processMacros='$session{form}{processMacros}', title=".quote($session{form}{title}).", displayTitle='$session{form}{displayTitle}', description=".quote($session{form}{description}).", dateAdded=now(), addedBy='$session{user}{userId}', sequenceNumber='$nextSeq'",$session{dbh}); + WebGUI::SQL->write("insert into widget values ($widgetId, $session{page}{pageId}, '$session{form}{widget}', '$nextSeq', ".quote($session{form}{title}).", '$session{form}{displayTitle}', ".quote($session{form}{description}).", '$session{form}{processMacros}', ".time().", '$session{user}{userId}', 0, 0)",$session{dbh}); return $widgetId; } #------------------------------------------------------------------- sub update { - WebGUI::SQL->write("update widget set title=".quote($session{form}{title}).", displayTitle='$session{form}{displayTitle}', description=".quote($session{form}{description}).", processMacros='$session{form}{processMacros}', lastEdited=now(), editedBy='$session{user}{userId}' where widgetId=$session{form}{wid}",$session{dbh}); + WebGUI::SQL->write("update widget set title=".quote($session{form}{title}).", displayTitle='$session{form}{displayTitle}', description=".quote($session{form}{description}).", processMacros='$session{form}{processMacros}', lastEdited=".time().", editedBy='$session{user}{userId}' where widgetId=$session{form}{wid}",$session{dbh}); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Widget/Article.pm b/lib/WebGUI/Widget/Article.pm index ec76c0680..02def261d 100644 --- a/lib/WebGUI/Widget/Article.pm +++ b/lib/WebGUI/Widget/Article.pm @@ -11,6 +11,7 @@ package WebGUI::Widget::Article; #------------------------------------------------------------------- use strict; +use WebGUI::DateTime; use WebGUI::Macro; use WebGUI::Privilege; use WebGUI::Session; @@ -40,8 +41,8 @@ sub www_add { $output .= ''; $output .= ''; $output .= ''; - $output .= ''; - $output .= ''; + $output .= ''; + $output .= ''; $output .= ''; $output .= ''; $output .= ''; @@ -64,7 +65,7 @@ sub www_addSave { $widgetId = create(); $image = saveAttachment("image",$widgetId); $attachment = saveAttachment("attachment",$widgetId); - WebGUI::SQL->write("insert into Article set widgetId=$widgetId, startDate='".humanToMysqlDate($session{form}{startDate})."', endDate='".humanToMysqlDate($session{form}{endDate})."', convertCarriageReturns='$session{form}{convertCarriageReturns}', body=".quote($session{form}{body}).", image=".quote($image).", linkTitle=".quote($session{form}{linkTitle}).", linkURL=".quote($session{form}{linkURL}).", attachment=".quote($attachment),$session{dbh}); + WebGUI::SQL->write("insert into Article values ($widgetId, '".setToEpoch($session{form}{startDate})."', '".setToEpoch($session{form}{endDate})."', ".quote($session{form}{body}).", ".quote($image).", ".quote($session{form}{linkTitle}).", ".quote($session{form}{linkURL}).", ".quote($attachment).", '$session{form}{convertCarriageReturns}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -95,7 +96,7 @@ sub www_deleteImage { sub www_edit { my ($output, %article); if (WebGUI::Privilege::canEditPage()) { - %article = WebGUI::SQL->quickHash("select widget.title, widget.displayTitle, date_format(Article.startDate,'%m/%d/%Y') as start, date_format(Article.endDate,'%m/%d/%Y') as end, Article.body, Article.image, Article.linkTitle, Article.linkURL, Article.attachment, widget.processMacros, Article.convertCarriageReturns from widget left join Article on (widget.widgetId=Article.widgetId) where widget.widgetId=$session{form}{wid}",$session{dbh}); + %article = WebGUI::SQL->quickHash("select * from widget,Article where widget.widgetId=Article.widgetId and widget.widgetId=$session{form}{wid}",$session{dbh}); $output = '

Edit Article

'; $output .= WebGUI::Form::hidden("wid",$session{form}{wid}); $output .= WebGUI::Form::hidden("func","editSave"); @@ -103,8 +104,8 @@ sub www_edit { $output .= ''; $output .= ''; $output .= ''; - $output .= ''; - $output .= ''; + $output .= ''; + $output .= ''; $output .= ''; if ($article{image} ne "") { $output .= ''; @@ -140,7 +141,7 @@ sub www_editSave { if ($attachment ne "") { $attachment = ', attachment='.quote($attachment); } - WebGUI::SQL->write("update Article set startDate='".humanToMysqlDate($session{form}{startDate})."', endDate='".humanToMysqlDate($session{form}{endDate})."', convertCarriageReturns='$session{form}{convertCarriageReturns}', body=".quote($session{form}{body}).", linkTitle=".quote($session{form}{linkTitle}).", linkURL=".quote($session{form}{linkURL}).$attachment.$image." where widgetId=$session{form}{wid}",$session{dbh}); + WebGUI::SQL->write("update Article set startDate='".setToEpoch($session{form}{startDate})."', endDate='".setToEpoch($session{form}{endDate})."', convertCarriageReturns='$session{form}{convertCarriageReturns}', body=".quote($session{form}{body}).", linkTitle=".quote($session{form}{linkTitle}).", linkURL=".quote($session{form}{linkURL}).$attachment.$image." where widgetId=$session{form}{wid}",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -151,7 +152,7 @@ sub www_editSave { sub www_view { my (%data, @test, $output, $widgetId); $widgetId = shift; - %data = WebGUI::SQL->quickHash("select widget.title, widget.displayTitle, widget.processMacros, Article.body, Article.image, Article.linkTitle, Article.linkURL, Article.attachment, Article.convertCarriageReturns from widget,Article where widget.widgetId='$widgetId' and widget.WidgetId=Article.widgetId and Article.startDatenow()",$session{dbh}); + %data = WebGUI::SQL->quickHash("select widget.title, widget.displayTitle, widget.processMacros, Article.body, Article.image, Article.linkTitle, Article.linkURL, Article.attachment, Article.convertCarriageReturns from widget,Article where widget.widgetId='$widgetId' and widget.WidgetId=Article.widgetId and Article.startDate<".time()." and Article.endDate>".time()."",$session{dbh}); if (defined %data) { if ($data{displayTitle} == 1) { $output = "

".$data{title}."

"; diff --git a/lib/WebGUI/Widget/EventsCalendar.pm b/lib/WebGUI/Widget/EventsCalendar.pm index b7666fab3..425673e3f 100644 --- a/lib/WebGUI/Widget/EventsCalendar.pm +++ b/lib/WebGUI/Widget/EventsCalendar.pm @@ -11,6 +11,7 @@ package WebGUI::Widget::EventsCalendar; #------------------------------------------------------------------- use strict; +use WebGUI::DateTime; use WebGUI::Macro; use WebGUI::Privilege; use WebGUI::Session; @@ -65,7 +66,7 @@ sub www_addSave { sub www_addEvent { my ($output, $today); if (WebGUI::Privilege::canEditPage()) { - ($today) = WebGUI::SQL->quickArray("select date_format(date_add(now(), interval 1 day),'%m/%d/%Y')",$session{dbh}); + ($today) = epochToSet(time()); $output = '

Add Event

'; $output .= WebGUI::Form::hidden("wid",$session{form}{wid}); $output .= WebGUI::Form::hidden("func","addEventSave"); @@ -88,7 +89,7 @@ sub www_addEventSave { my ($eventId); if (WebGUI::Privilege::canEditPage()) { $eventId = getNextId("eventId"); - WebGUI::SQL->write("insert into event set widgetId=$session{form}{wid}, eventId=$eventId, name=".quote($session{form}{name}).", description=".quote($session{form}{description}).", startDate='".humanToMysqlDate($session{form}{startDate})."', endDate='".humanToMysqlDate($session{form}{endDate})."'",$session{dbh}); + WebGUI::SQL->write("insert into event values ($eventId, $session{form}{wid}, ".quote($session{form}{name}).", ".quote($session{form}{description}).", '".setToEpoch($session{form}{startDate})."', '".setToEpoch($session{form}{endDate})."')",$session{dbh}); return www_edit(); } else { return WebGUI::Privilege::insufficient(); @@ -161,7 +162,7 @@ sub www_editSave { sub www_editEvent { my ($output, %event); if (WebGUI::Privilege::canEditPage()) { - %event = WebGUI::SQL->quickHash("select name, description, date_format(startDate,'%m/%d/%Y') as start, date_format(endDate,'%m/%d/%Y') as end from event where eventId='$session{form}{eid}'",$session{dbh}); + %event = WebGUI::SQL->quickHash("select * from event where eventId='$session{form}{eid}'",$session{dbh}); $output = '

Edit Event

'; $output .= WebGUI::Form::hidden("wid",$session{form}{wid}); $output .= WebGUI::Form::hidden("eid",$session{form}{eid}); @@ -170,8 +171,8 @@ sub www_editEvent { $output .= '' ; $output .= ''; - $output .= ''; - $output .= ''; + $output .= ''; + $output .= ''; $output .= ''; $output .= '
'.$data[1].'
Title'.WebGUI::Form::text("title",20,30,'Article').'
Display the title?'.WebGUI::Form::checkbox("displayTitle",1,1).'
Process macros?'.WebGUI::Form::checkbox("processMacros",1,1).'
Start Date'.WebGUI::Form::text("startDate",20,30,'01/01/2000',1).'
End Date'.WebGUI::Form::text("endDate",20,30,'01/01/2100',1).'
Start Date'.WebGUI::Form::text("startDate",20,30,epochToSet(time()),1).'
End Date'.WebGUI::Form::text("endDate",20,30,'01/01/2037',1).'
Body'.WebGUI::Form::textArea("body",'',50,10,1).'
Image'.WebGUI::Form::file("image").'
Link Title'.WebGUI::Form::text("linkTitle",20,30).'
Title'.WebGUI::Form::text("title",20,30,$article{title}).'
Display the title?'.WebGUI::Form::checkbox("displayTitle","1",$article{displayTitle}).'
Process macros?'.WebGUI::Form::checkbox("processMacros","1",$article{processMacros}).'
Start Date'.WebGUI::Form::text("startDate",20,30,$article{start},1).'
End Date'.WebGUI::Form::text("endDate",20,30,$article{end},1).'
Start Date'.WebGUI::Form::text("startDate",20,30,epochToSet($article{startDate}),1).'
End Date'.WebGUI::Form::text("endDate",20,30,epochToSet($article{endDate}),1).'
Body'.WebGUI::Form::textArea("body",$article{body},50,10,1).'
ImageDelete Image
Name'.WebGUI::Form::text("name",20,30,$event{name}).'
Description'.WebGUI::Form::textArea("description",$event{description},50,10,1).'
Start Date'.WebGUI::Form::text("startDate",20,30,$event{start},1).'
End Date'.WebGUI::Form::text("endDate",20,30,$event{end},1).'
Start Date'.WebGUI::Form::text("startDate",20,30,epochToSet($event{startDate}),1).'
End Date'.WebGUI::Form::text("endDate",20,30,epochToSet($event{endDate}),1).'
'.WebGUI::Form::submit("save").'
'; return $output; @@ -185,7 +186,7 @@ sub www_editEvent { sub www_editEventSave { my ($eventId); if (WebGUI::Privilege::canEditPage()) { - WebGUI::SQL->write("update event set name=".quote($session{form}{name}).", description=".quote($session{form}{description}).", startDate='".humanToMysqlDate($session{form}{startDate})."', endDate='".humanToMysqlDate($session{form}{endDate})."' where eventId=$session{form}{eid}",$session{dbh}); + WebGUI::SQL->write("update event set name=".quote($session{form}{name}).", description=".quote($session{form}{description}).", startDate='".setToEpoch($session{form}{startDate})."', endDate='".setToEpoch($session{form}{endDate})."' where eventId=$session{form}{eid}",$session{dbh}); return www_edit(); } else { return WebGUI::Privilege::insufficient(); @@ -204,13 +205,13 @@ sub www_view { if ($data{description} ne "") { $output .= $data{description}.'

'; } - $sth = WebGUI::SQL->read("select name, description, date_format(startDate,'%M'), date_format(startDate,'%e'), date_format(startDate,'%Y'), date_format(endDate,'%e') from event where widgetId='$widgetId' and to_days(startDate)>(to_days(now())-1) order by startDate",$session{dbh}); + $sth = WebGUI::SQL->read("select name, description, startDate, endDate from event where widgetId='$widgetId' and startDate>".(time()-86400)." order by startDate",$session{dbh}); while (@event = $sth->array) { - $output .= "$event[2] $event[3]"; - if ($event[3] ne $event[5]) { - $output .= "-$event[5]"; + $output .= "".epochToHuman($event[2],"%c")." ".epochToHuman($event[2],"%D"); + if (epochToHuman($event[2],"%D") ne epochToHuman($event[3],"%D")) { + $output .= "-".epochToHuman($event[3],"%D"); } - $output .= ", $event[4]"; + $output .= ", ".epochToHuman($event[2],"%y").""; $output .= "

"; $output .= ''.$event[0].''; if ($event[1] ne "") { diff --git a/lib/WebGUI/Widget/ExtraColumn.pm b/lib/WebGUI/Widget/ExtraColumn.pm index 3339d2371..04361f6e8 100644 --- a/lib/WebGUI/Widget/ExtraColumn.pm +++ b/lib/WebGUI/Widget/ExtraColumn.pm @@ -54,7 +54,7 @@ sub www_addSave { my ($widgetId, $displayTitle, $image, $attachment); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into ExtraColumn set widgetId=$widgetId, spacer='$session{form}{spacer}', width='$session{form}{width}', class=".quote($session{form}{class}),$session{dbh}); + WebGUI::SQL->write("insert into ExtraColumn values ($widgetId, '$session{form}{spacer}', '$session{form}{width}', ".quote($session{form}{class}).")",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/FAQ.pm b/lib/WebGUI/Widget/FAQ.pm index 61538d4d6..5d1e0c4fe 100644 --- a/lib/WebGUI/Widget/FAQ.pm +++ b/lib/WebGUI/Widget/FAQ.pm @@ -97,7 +97,7 @@ sub www_addQuestionSave { if (WebGUI::Privilege::canEditPage()) { ($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from faqQuestion where widgetId=$session{form}{wid}",$session{dbh}); $questionId = getNextId("questionId"); - WebGUI::SQL->write("insert into faqQuestion set widgetId=$session{form}{wid}, questionId=$questionId, sequenceNumber='$nextSeq', question=".quote($session{form}{question}).", answer=".quote($session{form}{answer}),$session{dbh}); + WebGUI::SQL->write("insert into faqQuestion values ($session{form}{wid}, $questionId, ".quote($session{form}{question}).", ".quote($session{form}{answer}).", '$nextSeq')",$session{dbh}); return www_edit(); } else { return WebGUI::Privilege::insufficient(); @@ -120,7 +120,7 @@ sub www_deleteQuestion { sub www_deleteQuestionConfirm { my ($output); if (WebGUI::Privilege::canEditPage()) { - WebGUI::SQL->write("delete from faqQuestions where questionId=$session{form}{qid}",$session{dbh}); + WebGUI::SQL->write("delete from faqQuestion where questionId=$session{form}{qid}",$session{dbh}); _reorderQuestions($session{form}{wid}); return www_edit(); } else { diff --git a/lib/WebGUI/Widget/LinkList.pm b/lib/WebGUI/Widget/LinkList.pm index 8250f0c16..7fcb48167 100644 --- a/lib/WebGUI/Widget/LinkList.pm +++ b/lib/WebGUI/Widget/LinkList.pm @@ -74,9 +74,8 @@ sub www_addSave { #------------------------------------------------------------------- sub www_addLink { - my ($output, $today); + my ($output); if (WebGUI::Privilege::canEditPage()) { - ($today) = WebGUI::SQL->quickArray("select date_format(date_add(now(), interval 1 day),'%m/%d/%Y')",$session{dbh}); $output = '

Add Link

'; $output .= WebGUI::Form::hidden("wid",$session{form}{wid}); $output .= WebGUI::Form::hidden("func","addLinkSave"); @@ -99,7 +98,7 @@ sub www_addLinkSave { if (WebGUI::Privilege::canEditPage()) { ($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber)+1 from link where widgetId=$session{form}{wid}",$session{dbh}); $linkId = getNextId("linkId"); - WebGUI::SQL->write("insert into link set widgetId=$session{form}{wid}, linkId=$linkId, name=".quote($session{form}{name}).", sequenceNumber='$nextSeq', url=".quote($session{form}{url}).", description=".quote($session{form}{description}),$session{dbh}); + WebGUI::SQL->write("insert into link values ($session{form}{wid}, $linkId, ".quote($session{form}{name}).", ".quote($session{form}{url}).", ".quote($session{form}{description}).", '$nextSeq')",$session{dbh}); return www_edit(); } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/MessageBoard.pm b/lib/WebGUI/Widget/MessageBoard.pm index 051a1c93d..5bedb6f2a 100644 --- a/lib/WebGUI/Widget/MessageBoard.pm +++ b/lib/WebGUI/Widget/MessageBoard.pm @@ -11,6 +11,7 @@ package WebGUI::Widget::MessageBoard; #------------------------------------------------------------------- use strict; +use WebGUI::DateTime; use WebGUI::Privilege; use WebGUI::Session; use WebGUI::SQL; @@ -20,7 +21,7 @@ use WebGUI::Widget; #------------------------------------------------------------------- sub _getBoardProperties { my (%board); - %board = WebGUI::SQL->quickHash("select widget.title, widget.displayTitle, widget.description, MessageBoard.groupToPost, MessageBoard.messagesPerPage, MessageBoard.editTimeout from widget left join MessageBoard on (widget.widgetId=MessageBoard.widgetId) where widget.widgetId=$_[0]",$session{dbh}); + %board = WebGUI::SQL->quickHash("select widget.title, widget.displayTitle, widget.description, MessageBoard.groupToPost, MessageBoard.messagesPerPage, MessageBoard.editTimeout from widget, MessageBoard where widget.widgetId=MessageBoard.widgetId and widget.widgetId=$_[0]",$session{dbh}); return %board; } @@ -30,13 +31,13 @@ sub _traverseReplyTree { for ($i=0;$i<=$_[1];$i++) { $depth .= "  "; } - $sth = WebGUI::SQL->read("select messageId,substring(subject,1,30),username,date_format(dateOfPost,'%c/%e %l:%i%p') from message where pid=$_[0] order by messageId", $session{dbh}); + $sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost from message where pid=$_[0] order by messageId", $session{dbh}); while (@data = $sth->array) { $html .= ''.$data[1].''.$data[2].''.$data[3].''; + $html .= '>'.$depth.''.substr($data[1],0,30).''.$data[2].''.epochToHuman($data[3],"%M/%D %H:%n%p").''; $html .= _traverseReplyTree($data[0],$_[1]+1); } $sth->finish; @@ -85,7 +86,7 @@ sub www_addSave { my ($widgetId); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into MessageBoard set widgetId=$widgetId, groupToPost=$session{form}{groupToPost}, messagesPerPage=$session{form}{messagesPerPage}, editTimeout=$session{form}{editTimeout}",$session{dbh}); + WebGUI::SQL->write("insert into MessageBoard values ($widgetId, $session{form}{groupToPost}, '$session{form}{messagesPerPage}', '$session{form}{editTimeout}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -209,8 +210,7 @@ sub www_postNewMessageSave { $session{form}{subject} .= ' (eom)'; } $mid = getNextId("messageId"); - WebGUI::SQL->write("insert into message set messageId=$mid, userId=$session{user}{userId}, username=".quote($session{user}{username}).", subject=".quote($session{form}{subject}).", message=".quote($session{form}{message}).", widgetId=$session{form}{wid}, pid=0, dateOfPost=now()",$session{dbh}); - WebGUI::SQL->write("update message set rid=$mid where messageId=$mid",$session{dbh}); + WebGUI::SQL->write("insert into message values ($mid, $mid, $session{form}{wid}, 0, $session{user}{userId}, ".quote($session{user}{username}).", ".quote($session{form}{subject}).", ".quote($session{form}{message}).", dateOfPost=".time().")",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -257,7 +257,7 @@ sub www_postReplySave { } $mid = getNextId("messageId"); ($rid) = WebGUI::SQL->quickArray("select rid from message where messageId=$session{form}{mid}",$session{dbh}); - WebGUI::SQL->write("insert into message set messageId=$mid, userId=$session{user}{userId}, username=".quote($session{user}{username}).", subject=".quote($session{form}{subject}).", message=".quote($session{form}{message}).", rid=$rid, widgetId=$session{form}{wid}, pid=$session{form}{mid}, dateOfPost=now()", $session{dbh}); + WebGUI::SQL->write("insert into message values ($mid, $rid, $session{form}{wid}, $session{form}{mid}, $session{user}{userId}, ".quote($session{user}{username}).", ".quote($session{form}{subject}).", ".quote($session{form}{message}).", dateOfPost=".time().")", $session{dbh}); return www_showMessage(); } else { return WebGUI::Privilege::insufficient(); @@ -304,12 +304,12 @@ sub www_showMessage { } $html .= ''; $html .= ''; - @data = WebGUI::SQL->quickArray("select messageId,substring(subject,1,30),username,date_format(dateOfPost,'%c/%e %l:%i%p') from message where messageId=$message{rid}",$session{dbh}); + @data = WebGUI::SQL->quickArray("select messageId,subject,username,dateOfPost from message where messageId=$message{rid}",$session{dbh}); $html .= ''.$data[1].''; + $html .= '>'; $html .= _traverseReplyTree($message{rid},1); $html .= "
SubjectAuthorDate
'.$data[2].''.$data[3].'
'.substr($data[1],0,30).''.$data[2].''.epochToHuman($data[3],"%M/%D %H:%n%p").'
"; return $html; @@ -330,9 +330,9 @@ sub www_view { $html .= 'Post New Message'; $html .= ''; $html .= ''; - $sth = WebGUI::SQL->read("select messageId,substring(subject,1,30),count(messageId)-1,username,date_format(dateOfPost,'%c/%e %l:%i%p'),date_format(max(dateOfPost),'%c/%e %l:%i%p'),max(messageId) from message where widgetId=$_[0] group by rid order by messageId desc", $session{dbh}); + $sth = WebGUI::SQL->read("select messageId,subject,count(messageId)-1,username,dateOfPost,max(dateOfPost),max(messageId) from message where widgetId=$_[0] group by rid order by messageId desc", $session{dbh}); while (@data = $sth->array) { - $row[$i] = ''; + $row[$i] = ''; $i++; } if ($session{form}{pn} < 1) { diff --git a/lib/WebGUI/Widget/Poll.pm b/lib/WebGUI/Widget/Poll.pm index 02f540632..5b993c520 100644 --- a/lib/WebGUI/Widget/Poll.pm +++ b/lib/WebGUI/Widget/Poll.pm @@ -119,7 +119,7 @@ sub www_addSave { if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); @answer = split("\n",$session{form}{answers}); - WebGUI::SQL->write("insert into Poll set widgetId=$widgetId, active='$session{form}{active}', voteGroup='$session{form}{voteGroup}', graphWidth='$session{form}{graphWidth}', question=".quote($session{form}{question}).", a1=".quote($answer[0]).", a2=".quote($answer[1]).", a3=".quote($answer[2]).", a4=".quote($answer[3]).", a5=".quote($answer[4]).", a6=".quote($answer[5]).", a7=".quote($answer[6]).", a8=".quote($answer[7]).", a9=".quote($answer[8]).", a10=".quote($answer[9]).", a11=".quote($answer[10]).", a12=".quote($answer[11]).", a13=".quote($answer[12]).", a14=".quote($answer[13]).", a15=".quote($answer[14]).", a16=".quote($answer[15]).", a17=".quote($answer[16]).", a18=".quote($answer[17]).", a19=".quote($answer[18]).", a20=".quote($answer[19])."",$session{dbh}); + WebGUI::SQL->write("insert into Poll values ($widgetId, '$session{form}{active}', '$session{form}{graphWidth}', '$session{form}{voteGroup}', ".quote($session{form}{question}).", ".quote($answer[0]).", ".quote($answer[1]).", ".quote($answer[2]).", ".quote($answer[3]).", ".quote($answer[4]).", ".quote($answer[5]).", ".quote($answer[6]).", ".quote($answer[7]).", ".quote($answer[8]).", ".quote($answer[9]).", ".quote($answer[10]).", ".quote($answer[11]).", ".quote($answer[12]).", ".quote($answer[13]).", ".quote($answer[14]).", ".quote($answer[15]).", ".quote($answer[16]).", ".quote($answer[17]).", ".quote($answer[18]).", ".quote($answer[19]).")",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -174,10 +174,7 @@ sub www_view { if ($data{active} eq "0") { $output = _viewResults($_[0]); } elsif (WebGUI::Privilege::isInGroup($data{voteGroup},$session{user}{userId})) { - ($hasVoted) = WebGUI::SQL->quickArray("select count(*) from pollAnswer where (userId=$session{user}{userId} or (userId=1 and ipAddress<>'$session{env}{REMOTE_ADDR}')) and widgetId=$_[0]",$session{dbh}); - unless (WebGUI::Privilege::isInGroup($data{voteGroup},$session{user}{userId})) { - $hasVoted = 1; - } + ($hasVoted) = WebGUI::SQL->quickArray("select count(*) from pollAnswer where widgetId=$_[0] and ((userId=$session{user}{userId} and userId<>1) or (userId=1 and ipAddress='$session{env}{REMOTE_ADDR}'))",$session{dbh}); if ($hasVoted) { $output = _viewResults($_[0]); } else { @@ -194,7 +191,7 @@ sub www_vote { my ($voteGroup); ($voteGroup) = WebGUI::SQL->quickArray("select voteGroup from Poll where widgetId='$session{form}{wid}'",$session{dbh}); if (WebGUI::Privilege::isInGroup($voteGroup,$session{user}{userId})) { - WebGUI::SQL->write("insert into pollAnswer set widgetId=$session{form}{wid}, userId=$session{user}{userId}, answer='$session{form}{answer}', ipAddress='$session{env}{REMOTE_ADDR}'",$session{dbh}); + WebGUI::SQL->write("insert into pollAnswer values ($session{form}{wid}, '$session{form}{answer}', $session{user}{userId}, '$session{env}{REMOTE_ADDR}')",$session{dbh}); } return ""; } diff --git a/lib/WebGUI/Widget/SQLReport.pm b/lib/WebGUI/Widget/SQLReport.pm index c96009501..4108cc502 100644 --- a/lib/WebGUI/Widget/SQLReport.pm +++ b/lib/WebGUI/Widget/SQLReport.pm @@ -62,7 +62,7 @@ sub www_addSave { my ($widgetId); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into SQLReport set widgetId=$widgetId, convertCarriageReturns='$session{form}{convertCarriageReturns}', template=".quote($session{form}{template}).", dBquery=".quote($session{form}{dbQuery}).", DSN=".quote($session{form}{DSN}).", username=".quote($session{form}{username}).", identifier=".quote($session{form}{identifier}),$session{dbh}); + WebGUI::SQL->write("insert into SQLReport values($widgetId, ".quote($session{form}{template}).", ".quote($session{form}{dbQuery}).", ".quote($session{form}{DSN}).", ".quote($session{form}{username}).", ".quote($session{form}{identifier}).", '$session{form}{convertCarriageReturns}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/SearchMnoGo.pm b/lib/WebGUI/Widget/SearchMnoGo.pm index 6599cee8b..318681005 100644 --- a/lib/WebGUI/Widget/SearchMnoGo.pm +++ b/lib/WebGUI/Widget/SearchMnoGo.pm @@ -96,7 +96,7 @@ sub www_addSave { my ($widgetId); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into SearchMnoGo set widgetId=$widgetId, DSN=".quote($session{form}{DSN}).", username=".quote($session{form}{username}).", identifier=".quote($session{form}{identifier}),$session{dbh}); + WebGUI::SQL->write("insert into SearchMnoGo values ($widgetId, ".quote($session{form}{DSN}).", ".quote($session{form}{username}).", ".quote($session{form}{identifier}).")",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/SiteMap.pm b/lib/WebGUI/Widget/SiteMap.pm index 92121be62..66bdeae4d 100644 --- a/lib/WebGUI/Widget/SiteMap.pm +++ b/lib/WebGUI/Widget/SiteMap.pm @@ -72,7 +72,7 @@ sub www_addSave { my ($widgetId, $displayTitle, $image, $attachment); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into SiteMap set widgetId=$widgetId, startAtThisLevel='$session{form}{startAtThisLevel}', showOnlyThisLevel='$session{form}{showOnlyThisLevel}'",$session{dbh}); + WebGUI::SQL->write("insert into SiteMap values ($widgetId, '$session{form}{startAtThisLevel}', '$session{form}{showOnlyThisLevel}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/SyndicatedContent.pm b/lib/WebGUI/Widget/SyndicatedContent.pm index 7012ada86..4ad788295 100644 --- a/lib/WebGUI/Widget/SyndicatedContent.pm +++ b/lib/WebGUI/Widget/SyndicatedContent.pm @@ -55,7 +55,7 @@ sub www_addSave { my ($widgetId); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into SyndicatedContent set widgetId=$widgetId, rssUrl=".quote($session{form}{rssUrl}).", content='Not yet fetched.'",$session{dbh}); + WebGUI::SQL->write("insert into SyndicatedContent values ($widgetId, ".quote($session{form}{rssUrl}).", 'Not yet fetched.', '".time()."')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); diff --git a/lib/WebGUI/Widget/UserSubmission.pm b/lib/WebGUI/Widget/UserSubmission.pm index dbb50018a..9d4ef7a7e 100644 --- a/lib/WebGUI/Widget/UserSubmission.pm +++ b/lib/WebGUI/Widget/UserSubmission.pm @@ -11,6 +11,7 @@ package WebGUI::Widget::UserSubmission; #------------------------------------------------------------------- use strict; +use WebGUI::DateTime; use WebGUI::Privilege; use WebGUI::Session; use WebGUI::SQL; @@ -60,7 +61,7 @@ sub www_addSave { my ($widgetId); if (WebGUI::Privilege::canEditPage()) { $widgetId = create(); - WebGUI::SQL->write("insert into UserSubmission set widgetId=$widgetId, groupToContribute=$session{form}{groupToContribute}, submissionsPerPage=$session{form}{submissionsPerPage}, defaultStatus='$session{form}{defaultStatus}'",$session{dbh}); + WebGUI::SQL->write("insert into UserSubmission values ($widgetId, $session{form}{groupToContribute}, '$session{form}{submissionsPerPage}', '$session{form}{defaultStatus}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -85,9 +86,9 @@ sub www_addSubmission { $output .= '
SubjectAuthorThread StartedRepliesLast Reply
'.$data[1].''.$data[3].''.$data[4].''.$data[2].''.$data[5].'
'.substr($data[1],0,30).''.$data[3].''.epochToHuman($data[4],"%M/%D %H:%n%p").''.$data[2].''.epochToHuman($data[5],"%M/%D %H:%n%p").'
'; $output .= ''; $output .= ''; - $sth = WebGUI::SQL->read("select title,submissionId,date_format(dateSubmitted,'%c/%e/%Y'),status from submission where widgetId='$session{form}{wid}' and userId=$session{user}{userId} order by dateSubmitted desc",$session{dbh}); + $sth = WebGUI::SQL->read("select title,submissionId,dateSubmitted,status from submission where widgetId='$session{form}{wid}' and userId=$session{user}{userId} order by dateSubmitted desc",$session{dbh}); while (@submission = $sth->array) { - $output .= ''; + $output .= ''; } $sth->finish; $output .= '
Edit/DeleteTitleDate SubmittedStatus
'.$submission[0].''.$submission[2].''.$submission[3].'
'.$submission[0].''.epochToHuman($submission[2],"%M/%D/%y").''.$submission[3].'
'; @@ -110,7 +111,7 @@ sub www_addSubmissionSave { } else { $title = "Untitled"; } - WebGUI::SQL->write("insert into submission set widgetId=$session{form}{wid}, submissionId=$submissionId, convertCarriageReturns='$session{form}{convertCarriageReturns}', title=".quote($title).", username=".quote($session{user}{username}).", status='$status', dateSubmitted=now(), userId='$session{user}{userId}', content=".quote($session{form}{content}).", image=".quote($image).", attachment=".quote($attachment),$session{dbh}); + WebGUI::SQL->write("insert into submission values ($session{form}{wid}, $submissionId, ".quote($title).", ".time().", ".quote($session{user}{username}).", '$session{user}{userId}', ".quote($session{form}{content}).", ".quote($image).", ".quote($attachment).", '$status', '$session{form}{convertCarriageReturns}')",$session{dbh}); return ""; } else { return WebGUI::Privilege::insufficient(); @@ -275,9 +276,9 @@ sub www_view { if ($data{description} ne "") { $output .= $data{description}.'

'; } - $sth = WebGUI::SQL->read("select title,submissionId,date_format(dateSubmitted,'%c/%e/%Y'),username,userId from submission where widgetId='$widgetId' and status='Approved' order by dateSubmitted desc",$session{dbh}); + $sth = WebGUI::SQL->read("select title,submissionId,dateSubmitted,username,userId from submission where widgetId='$widgetId' and status='Approved' order by dateSubmitted desc",$session{dbh}); while (@submission = $sth->array) { - $row[$i] = ''.$submission[0].''.$submission[2].''.$submission[3].''; + $row[$i] = ''.$submission[0].''.epochToHuman($submission[2],"%M/%D/%y").''.$submission[3].''; $i++; } $sth->finish; diff --git a/lib/runHourly.pl b/lib/runHourly.pl index 91f0a2874..d0d95da3e 100644 --- a/lib/runHourly.pl +++ b/lib/runHourly.pl @@ -28,7 +28,7 @@ $dbh->disconnect(); #------------------------------------------------------------------- sub deleteExpiredSessions { - WebGUI::SQL->write("delete from session where expireswrite("delete from session where expires<".time(),$dbh); } #------------------------------------------------------------------- @@ -97,11 +97,11 @@ sub updateSyndicatedContent { $rss = getRSS($data[1]); $html = generateHTML($rss); if ($html ne "") { - WebGUI::SQL->write("update SyndicatedContent set content=".$dbh->quote($html).", lastFetched=now() where widgetId=$data[0]",$dbh); + WebGUI::SQL->write("update SyndicatedContent set content=".$dbh->quote($html).", lastFetched=".time()." where widgetId=$data[0]",$dbh); } elsif (substr($data[2],6) ne "Unable" && substr($data[2],7) ne "Not yet") { # then just leave the existing content in place } else { - WebGUI::SQL->write("update SyndicatedContent set content='Unable to fetch content. Perhaps the RSS is improperly formated.', lastFetched=now() where widgetId=$data[0]",$dbh); + WebGUI::SQL->write("update SyndicatedContent set content='Unable to fetch content. Perhaps the RSS is improperly formated.', lastFetched=".time()." where widgetId=$data[0]",$dbh); } } $sth->finish; diff --git a/testEnvironment.pl b/testEnvironment.pl index c6396b2e5..8f314d2eb 100644 --- a/testEnvironment.pl +++ b/testEnvironment.pl @@ -9,7 +9,7 @@ #------------------------------------------------------------------- BEGIN { - unshift (@INC, "./lib/"); + unshift (@INC, "./lib"); } use strict; @@ -35,6 +35,10 @@ if (eval { require DBI }) { print "Please install.\n"; } +print "Database drivers:\t"; +print join(", ",DBI->available_drivers); +print "\n"; + print "LWP module:\t\t"; if (eval { require LWP }) { print "OK\n"; @@ -49,13 +53,6 @@ if (eval { require Tie::IxHash }) { print "Please install.\n"; } -print "Mysql module:\t\t"; -if (eval { require Mysql }) { - print "OK\n"; -} else { - print "Please install.\n"; -} - print "XML::RSS module:\t"; if (eval { require XML::RSS }) { print "OK\n"; @@ -79,7 +76,8 @@ if (eval { require Net::LDAP }) { # this is here to insure they installed correctly. print "WebGUI modules:\t\t"; -if (eval { require WebGUI } && eval { require WebGUI::SQL }) { +#if (eval { require WebGUI } && eval { require WebGUI::SQL }) { +if (eval { require WebGUI::SQL }) { print "OK\n"; } else { print "Please install.\n"; @@ -119,8 +117,7 @@ unless (defined $config) { print "Database connection:\t"; my ($dbh, $test); -$dbh = DBI->connect($config->param('dsn'), $config->param('dbuser'), $config->param('dbpass')); -unless (defined $dbh) { +unless (eval { $dbh = DBI->connect($config->param('dsn'), $config->param('dbuser'), $config->param('dbpass')) }) { print "Can't connect with info provided.\n"; } else { print "OK\n"; @@ -154,7 +151,9 @@ $request = new HTTP::Request (GET => "http://www.plainblack.com/downloads/latest $response = $userAgent->request($request); $version = $response->content; chomp $version; -if ($version eq $WebGUI::VERSION) { +if ($response->is_error) { + print "Couldn't connect to Plain Black Software. Check your connection and try again.\n"; +} elsif ($version eq $WebGUI::VERSION) { print "OK\n"; } else { print "There is a newer version of WebGUI available.\n";