diff --git a/docs/create.sql b/docs/create.sql index 9783fbbc7..b15458262 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -12,7 +12,7 @@ CREATE TABLE Article ( widgetId int(11) default NULL, startDate int(11) default NULL, endDate int(11) default NULL, - body text, + body mediumtext, image varchar(255) default NULL, linkTitle varchar(255) default NULL, linkURL text, @@ -116,23 +116,6 @@ CREATE TABLE SQLReport ( # -# -# Table structure for table 'SearchMnoGo' -# - -CREATE TABLE SearchMnoGo ( - widgetId int(11) NOT NULL default '0', - DSN varchar(255) default NULL, - username varchar(255) default NULL, - identifier varchar(255) default NULL, - PRIMARY KEY (widgetId) -) TYPE=MyISAM; - -# -# Dumping data for table 'SearchMnoGo' -# - - # # Table structure for table 'SiteMap' # @@ -319,7 +302,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. Some macros can be extended/configured by taking the format of ^xconfig text^/x. The following is a description of all the macros in the WebGUI system.\r\n\r\n^a or ^a^/a - My Account Link\r\nA link to your account information. In addition you can change the link text by creating a macro like this ^aAccount Info^/a.\r\n\r\n^C - Crumb Trail\r\nA dynamically generated crumb trail to the current page.\r\n\r\n^D or ^D^/D - Date\r\nThe current date and time.\r\n\r\nYou can configure the date by using date formatting symbols. For instance if you created a macro like this ^D%c %D, %y^/D it would output September 26, 2001. The following are the available date formatting symbols:\r\n\r\n %% = %\r\n %y = 4 digit year\r\n %Y = 2 digit year\r\n %m = 2 digit month\r\n %M = variable digit month\r\n %c = month name\r\n %d = 2 digit day of month\r\n %D = variable digit day of month\r\n %w = day of week name\r\n %h = 2 digit base 12 hour\r\n %H = variable digit base 12 hour\r\n %j = 2 digit base 24 hour\r\n %J = variable digit base 24 hour\r\n %p = lower case am/pm\r\n %P = upper case AM/PM\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 or ^H^/H - Home Link\r\nA link to the home page of this site. In addition you can change the link text by creating a macro like this ^HGo Home^/H.\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 or ^r^/r - Make Page Printable\r\nCreates a link to remove the style from a page to make it printable. In addition you can change the link text by creating a macro like this ^rPRINT!^/r.\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^^ - 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','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. Some macros can be extended/configured by taking the format of ^xconfig text^/x. The following is a description of all the macros in the WebGUI system.\r\n\r\n^A^/A - Any SubMenu\r\nThis macro allows you to get the submenu of any page, starting with the page you specified. For instance, you could get the home page submenu by creating a macro that looks like this ^Ahome,0. The first value is the urlized title of the page and the second value is the depth you\'d like the menu to go. By default it will show only the first level. To go three levels deep create a macro like this ^A3^/A. If you set the macro to \"0\" it will track the entire site tree.\r\n\r\n^a or ^a^/a - My Account Link\r\nA link to your account information. In addition you can change the link text by creating a macro like this ^aAccount Info^/a.\r\n\r\n^C - Crumb Trail\r\nA dynamically generated crumb trail to the current page.\r\n\r\n^c - Company Name\r\nThe name of your company specified in the settings by your Administrator.\r\n\r\n^D or ^D^/D - Date\r\nThe current date and time.\r\n\r\nYou can configure the date by using date formatting symbols. For instance, if you created a macro like this ^D%c %D, %y^/D it would output September 26, 2001. The following are the available date formatting symbols:\r\n\r\n %% = %\r\n %y = 4 digit year\r\n %Y = 2 digit year\r\n %m = 2 digit month\r\n %M = variable digit month\r\n %c = month name\r\n %d = 2 digit day of month\r\n %D = variable digit day of month\r\n %w = day of week name\r\n %h = 2 digit base 12 hour\r\n %H = variable digit base 12 hour\r\n %j = 2 digit base 24 hour\r\n %J = variable digit base 24 hour\r\n %p = lower case am/pm\r\n %P = upper case AM/PM\r\n\r\n^e - Company Email Address\r\nThe email address for your company specified in the settings by your Administrator.\r\n\r\n^H or ^H^/H - Home Link\r\nA link to the home page of this site. In addition you can change the link text by creating a macro like this ^HGo Home^/H.\r\n\r\n^L - Login\r\nA small login form.\r\n\r\n^M or ^M^/M - Current Menu (Vertical)\r\nA vertical menu containing the sub-pages at the current level. In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^M3^/M. If you set the macro to \"0\" it will track the entire site tree.\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 or ^P^/P - Previous Menu (Vertical)\r\nA vertical menu containing the sub-pages at the previous level. In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^TP^/P. If you set the macro to \"0\" it will track the entire site tree.\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 or ^r^/r - Make Page Printable\r\nCreates a link to remove the style from a page to make it printable. In addition, you can change the link text by creating a macro like this ^rPRINT!^/r.\r\n\r\n^T or ^T^/T - Top Level Menu (Vertical)\r\nA vertical menu containing the main pages of the site (aka the sub-pages from the home page). In addition, you may configure this macro by specifying how many levels deep the menu should go. By default it will show only the first level. To go three levels deep create a macro like this ^T3^/T. If you set the macro to \"0\" it will track the entire site tree.\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^u - Company URL\r\nThe URL for your company specified in the settings by your Administrator.\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^* or ^*^/* - 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. In addition, you may configure this macro like this ^*100^/* to create a random number between 0 and 100.\r\n\r\n^0,^1,^2,^3,^4,^5,^6,^7,^8,^9, ^-\r\nThese macros are reserved for widget-specific functions as in the SQL Report widget.\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'); @@ -373,6 +356,326 @@ INSERT INTO incrementer VALUES ('questionId',1); INSERT INTO incrementer VALUES ('submissionId',1); INSERT INTO incrementer VALUES ('recurringEventId',1); +# +# Table structure for table 'international' +# + +CREATE TABLE international ( + internationalId int(11) NOT NULL default '0', + language varchar(30) NOT NULL default 'English', + message text, + PRIMARY KEY (internationalId,language) +) TYPE=MyISAM; + +# +# Dumping data for table 'international' +# + +INSERT INTO international VALUES (1,'English','Add content...'); +INSERT INTO international VALUES (2,'English','Page'); +INSERT INTO international VALUES (3,'English','Paste from clipboard...'); +INSERT INTO international VALUES (4,'English','Manage settings.'); +INSERT INTO international VALUES (5,'English','Manage groups.'); +INSERT INTO international VALUES (6,'English','Manage styles.'); +INSERT INTO international VALUES (7,'English','Manage users.'); +INSERT INTO international VALUES (8,'English','View page not found.'); +INSERT INTO international VALUES (9,'English','View clipboard.'); +INSERT INTO international VALUES (10,'English','View trash.'); +INSERT INTO international VALUES (11,'English','Empy trash.'); +INSERT INTO international VALUES (12,'English','Turn admin off.'); +INSERT INTO international VALUES (13,'English','View help index.'); +INSERT INTO international VALUES (14,'English','View pending submissions.'); +INSERT INTO international VALUES (15,'English','January'); +INSERT INTO international VALUES (16,'English','February'); +INSERT INTO international VALUES (17,'English','March'); +INSERT INTO international VALUES (18,'English','April'); +INSERT INTO international VALUES (19,'English','May'); +INSERT INTO international VALUES (20,'English','June'); +INSERT INTO international VALUES (21,'English','July'); +INSERT INTO international VALUES (22,'English','August'); +INSERT INTO international VALUES (23,'English','September'); +INSERT INTO international VALUES (24,'English','October'); +INSERT INTO international VALUES (25,'English','November'); +INSERT INTO international VALUES (26,'English','December'); +INSERT INTO international VALUES (27,'English','Sunday'); +INSERT INTO international VALUES (28,'English','Monday'); +INSERT INTO international VALUES (29,'English','Tuesday'); +INSERT INTO international VALUES (30,'English','Wednesday'); +INSERT INTO international VALUES (31,'English','Thursday'); +INSERT INTO international VALUES (32,'English','Friday'); +INSERT INTO international VALUES (33,'English','Saturday'); +INSERT INTO international VALUES (34,'English','set date'); +INSERT INTO international VALUES (35,'English','Administrative Function'); +INSERT INTO international VALUES (36,'English','You must be an administrator to perform this function. Please contact one of your administrators. The following is a list of the administrators for this system:'); +INSERT INTO international VALUES (37,'English','Permission Denied!'); +INSERT INTO international VALUES (38,'English','You do not have sufficient privileges to perform this operation. Please log in with an account that has sufficient privileges before attempting this operation.'); +INSERT INTO international VALUES (39,'English','You do not have sufficient privileges to access this page.'); +INSERT INTO international VALUES (41,'English','You\'re attempting to remove a vital component of the WebGUI system. If you were allowed to continue WebGUI may cease to function.'); +INSERT INTO international VALUES (40,'English','Vital Component'); +INSERT INTO international VALUES (42,'English','Please Confirm'); +INSERT INTO international VALUES (43,'English','Are you certain that you wish to delete this content?'); +INSERT INTO international VALUES (44,'English','Yes, I\'m sure.'); +INSERT INTO international VALUES (45,'English','No, I made a mistake.'); +INSERT INTO international VALUES (46,'English','My Account'); +INSERT INTO international VALUES (47,'English','Home'); +INSERT INTO international VALUES (48,'English','Hello'); +INSERT INTO international VALUES (49,'English','Click here to log out.'); +INSERT INTO international VALUES (50,'English','Username'); +INSERT INTO international VALUES (51,'English','Password'); +INSERT INTO international VALUES (52,'English','login'); +INSERT INTO international VALUES (53,'English','Make Page Printable'); +INSERT INTO international VALUES (54,'English','Create Account'); +INSERT INTO international VALUES (55,'English','Password (confirm)'); +INSERT INTO international VALUES (56,'English','Email Address'); +INSERT INTO international VALUES (57,'English','This is only necessary if you wish to use features that require Email.'); +INSERT INTO international VALUES (58,'English','I already have an account.'); +INSERT INTO international VALUES (59,'English','I forgot my password.'); +INSERT INTO international VALUES (60,'English','Are you certain you want to deactivate your account. If you proceed your account information will be lost permanently.'); +INSERT INTO international VALUES (61,'English','Update Account Information'); +INSERT INTO international VALUES (62,'English','save'); +INSERT INTO international VALUES (63,'English','Turn admin on.'); +INSERT INTO international VALUES (64,'English','Log out.'); +INSERT INTO international VALUES (65,'English','Please deactivate my account permanently.'); +INSERT INTO international VALUES (66,'English','Log In'); +INSERT INTO international VALUES (67,'English','Create a new account.'); +INSERT INTO international VALUES (68,'English','The account information you supplied is invalid. Either the account does not exist or the username/password combination was incorrect.'); +INSERT INTO international VALUES (69,'English','Please contact your system administrator for assistance.'); +INSERT INTO international VALUES (70,'English','Error'); +INSERT INTO international VALUES (71,'English','Recover password'); +INSERT INTO international VALUES (72,'English','recover'); +INSERT INTO international VALUES (73,'English','Log in.'); +INSERT INTO international VALUES (74,'English','Account Information'); +INSERT INTO international VALUES (75,'English','Your account information has been sent to your email address.'); +INSERT INTO international VALUES (76,'English','That email address is not in our databases.'); +INSERT INTO international VALUES (77,'English','That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:'); +INSERT INTO international VALUES (78,'English','Your passwords did not match. Please try again.'); +INSERT INTO international VALUES (79,'English','Cannot connect to LDAP server.'); +INSERT INTO international VALUES (80,'English','Account created successfully!'); +INSERT INTO international VALUES (81,'English','Account updated successfully!'); +INSERT INTO international VALUES (82,'English','Administrative functions...'); +INSERT INTO international VALUES (83,'English','Add Group'); +INSERT INTO international VALUES (84,'English','Group Name'); +INSERT INTO international VALUES (85,'English','Description'); +INSERT INTO international VALUES (86,'English','Are you certain you wish to delete this group? Beware that deleting a group is permanent and will remove all privileges associated with this group.'); +INSERT INTO international VALUES (87,'English','Edit Group'); +INSERT INTO international VALUES (88,'English','Users In Group'); +INSERT INTO international VALUES (89,'English','Groups'); +INSERT INTO international VALUES (90,'English','Add new group.'); +INSERT INTO international VALUES (91,'English','Previous Page'); +INSERT INTO international VALUES (92,'English','Next Page'); +INSERT INTO international VALUES (93,'English','Help'); +INSERT INTO international VALUES (94,'English','See also'); +INSERT INTO international VALUES (95,'English','Help Index'); +INSERT INTO international VALUES (96,'English','Sorted By Action'); +INSERT INTO international VALUES (97,'English','Sorted by Object'); +INSERT INTO international VALUES (98,'English','Add Page'); +INSERT INTO international VALUES (99,'English','Title'); +INSERT INTO international VALUES (100,'English','Meta Tags'); +INSERT INTO international VALUES (101,'English','Are you certain that you wish to delete this page, its content, and all items under it?'); +INSERT INTO international VALUES (102,'English','Edit Page'); +INSERT INTO international VALUES (103,'English','Page Specifics'); +INSERT INTO international VALUES (104,'English','Page URL'); +INSERT INTO international VALUES (105,'English','Style'); +INSERT INTO international VALUES (106,'English','Check to give this style to all sub-pages.'); +INSERT INTO international VALUES (107,'English','Privileges'); +INSERT INTO international VALUES (108,'English','Owner'); +INSERT INTO international VALUES (109,'English','Owner can view?'); +INSERT INTO international VALUES (110,'English','Owner can edit?'); +INSERT INTO international VALUES (111,'English','Group'); +INSERT INTO international VALUES (112,'English','Group can view?'); +INSERT INTO international VALUES (113,'English','Group can edit?'); +INSERT INTO international VALUES (114,'English','Anybody can view?'); +INSERT INTO international VALUES (115,'English','Anybody can edit?'); +INSERT INTO international VALUES (116,'English','Check to give these privileges to all sub-pages.'); +INSERT INTO international VALUES (117,'English','Edit Authentication Settings'); +INSERT INTO international VALUES (118,'English','Anonymous Registration'); +INSERT INTO international VALUES (119,'English','Authentication Method (default)'); +INSERT INTO international VALUES (120,'English','LDAP URL (default)'); +INSERT INTO international VALUES (121,'English','LDAP Identity (default)'); +INSERT INTO international VALUES (122,'English','LDAP Identity Name'); +INSERT INTO international VALUES (123,'English','LDAP Password Name'); +INSERT INTO international VALUES (124,'English','Edit Company Information'); +INSERT INTO international VALUES (125,'English','Company Name'); +INSERT INTO international VALUES (126,'English','Company Email Address'); +INSERT INTO international VALUES (127,'English','Company URL'); +INSERT INTO international VALUES (128,'English','Edit File Settings'); +INSERT INTO international VALUES (129,'English','Path to WebGUI Extras'); +INSERT INTO international VALUES (130,'English','Maximum Attachment Size'); +INSERT INTO international VALUES (131,'English','Web Attachment Path'); +INSERT INTO international VALUES (132,'English','Server Attachment Path'); +INSERT INTO international VALUES (133,'English','Edit Mail Settings'); +INSERT INTO international VALUES (134,'English','Recover Password Message'); +INSERT INTO international VALUES (135,'English','SMTP Server'); +INSERT INTO international VALUES (136,'English','Home Page'); +INSERT INTO international VALUES (137,'English','Page Not Found Page'); +INSERT INTO international VALUES (138,'English','Yes'); +INSERT INTO international VALUES (139,'English','No'); +INSERT INTO international VALUES (140,'English','Edit Miscellaneous Settings'); +INSERT INTO international VALUES (141,'English','Not Found Page'); +INSERT INTO international VALUES (142,'English','Session Timeout'); +INSERT INTO international VALUES (143,'English','Manage Settings'); +INSERT INTO international VALUES (144,'English','View Statistics'); +INSERT INTO international VALUES (145,'English','WebGUI Build Version'); +INSERT INTO international VALUES (146,'English','Active Sessions'); +INSERT INTO international VALUES (147,'English','Viewable Pages'); +INSERT INTO international VALUES (148,'English','Viewable Widgets'); +INSERT INTO international VALUES (149,'English','Users'); +INSERT INTO international VALUES (150,'English','Add Style'); +INSERT INTO international VALUES (151,'English','Style Name'); +INSERT INTO international VALUES (152,'English','Header'); +INSERT INTO international VALUES (153,'English','Footer'); +INSERT INTO international VALUES (154,'English','Style Sheet'); +INSERT INTO international VALUES (155,'English','Are you certain you wish to delete this style and migrate all pages using this style to the \"Fail Safe\" style?'); +INSERT INTO international VALUES (156,'English','Edit Style'); +INSERT INTO international VALUES (157,'English','Styles'); +INSERT INTO international VALUES (158,'English','Add a new style.'); +INSERT INTO international VALUES (159,'English','Pending Submissions'); +INSERT INTO international VALUES (160,'English','Date Submitted'); +INSERT INTO international VALUES (161,'English','Submitted By'); +INSERT INTO international VALUES (162,'English','Are you certain that you wish to purge all the pages and widgets in the trash?'); +INSERT INTO international VALUES (163,'English','Add User'); +INSERT INTO international VALUES (164,'English','Authentication Method'); +INSERT INTO international VALUES (165,'English','LDAP URL'); +INSERT INTO international VALUES (166,'English','Connect DN'); +INSERT INTO international VALUES (167,'English','Are you certain you want to delete this user? Be warned that all this user\'s information will be lost permanently if you choose to proceed.'); +INSERT INTO international VALUES (168,'English','Edit User'); +INSERT INTO international VALUES (169,'English','Add a new user.'); +INSERT INTO international VALUES (170,'English','search'); +INSERT INTO international VALUES (171,'English','rich edit'); +INSERT INTO international VALUES (172,'English','Article'); +INSERT INTO international VALUES (173,'English','Add Article'); +INSERT INTO international VALUES (174,'English','Display the title?'); +INSERT INTO international VALUES (175,'English','Process macros?'); +INSERT INTO international VALUES (176,'English','Start Date'); +INSERT INTO international VALUES (177,'English','End Date'); +INSERT INTO international VALUES (178,'English','Body'); +INSERT INTO international VALUES (179,'English','Image'); +INSERT INTO international VALUES (180,'English','Link Title'); +INSERT INTO international VALUES (181,'English','Link URL'); +INSERT INTO international VALUES (182,'English','Attachment'); +INSERT INTO international VALUES (183,'English','Convert carriage returns?'); +INSERT INTO international VALUES (184,'English','(Check if you aren\'t adding <br> manually.)'); +INSERT INTO international VALUES (185,'English','Edit Article'); +INSERT INTO international VALUES (186,'English','Delete'); +INSERT INTO international VALUES (187,'English','Events Calendar'); +INSERT INTO international VALUES (188,'English','Add Events Calendar'); +INSERT INTO international VALUES (189,'English','Happens only once.'); +INSERT INTO international VALUES (190,'English','Day'); +INSERT INTO international VALUES (191,'English','Week'); +INSERT INTO international VALUES (192,'English','Add Event'); +INSERT INTO international VALUES (193,'English','Recurs every'); +INSERT INTO international VALUES (194,'English','until'); +INSERT INTO international VALUES (195,'English','Are you certain that you want to delete this event'); +INSERT INTO international VALUES (197,'English','Edit Events Calendar'); +INSERT INTO international VALUES (196,'English','and all of its recurring events'); +INSERT INTO international VALUES (198,'English','Edit Event'); +INSERT INTO international VALUES (199,'English','Extra Column'); +INSERT INTO international VALUES (200,'English','Add Extra Column'); +INSERT INTO international VALUES (201,'English','Spacer'); +INSERT INTO international VALUES (202,'English','Width'); +INSERT INTO international VALUES (203,'English','StyleSheet Class'); +INSERT INTO international VALUES (204,'English','Edit Extra Column'); +INSERT INTO international VALUES (205,'English','F.A.Q.'); +INSERT INTO international VALUES (206,'English','Add F.A.Q.'); +INSERT INTO international VALUES (207,'English','Add Question'); +INSERT INTO international VALUES (208,'English','Question'); +INSERT INTO international VALUES (209,'English','Answer'); +INSERT INTO international VALUES (211,'English','Edit F.A.Q.'); +INSERT INTO international VALUES (210,'English','Are you certain that you want to delete this question?'); +INSERT INTO international VALUES (212,'English','Add a new question.'); +INSERT INTO international VALUES (213,'English','Edit Question'); +INSERT INTO international VALUES (214,'English','Link List'); +INSERT INTO international VALUES (215,'English','Add Link'); +INSERT INTO international VALUES (216,'English','URL'); +INSERT INTO international VALUES (217,'English','Are you certain that you want to delete this link?'); +INSERT INTO international VALUES (218,'English','Edit Link List'); +INSERT INTO international VALUES (219,'English','Add Link List'); +INSERT INTO international VALUES (220,'English','Edit Link'); +INSERT INTO international VALUES (221,'English','Add a new link.'); +INSERT INTO international VALUES (222,'English','Add Message Board'); +INSERT INTO international VALUES (223,'English','Message Board'); +INSERT INTO international VALUES (224,'English','Who can post?'); +INSERT INTO international VALUES (225,'English','Messages Per Page'); +INSERT INTO international VALUES (226,'English','Edit Timeout'); +INSERT INTO international VALUES (227,'English','Edit Message Board'); +INSERT INTO international VALUES (228,'English','Editing Message...'); +INSERT INTO international VALUES (229,'English','Subject'); +INSERT INTO international VALUES (230,'English','Message'); +INSERT INTO international VALUES (231,'English','Posting New Message...'); +INSERT INTO international VALUES (232,'English','no subject'); +INSERT INTO international VALUES (233,'English','(eom)'); +INSERT INTO international VALUES (234,'English','Posting Reply...'); +INSERT INTO international VALUES (235,'English','Edit Message'); +INSERT INTO international VALUES (236,'English','Post Reply'); +INSERT INTO international VALUES (237,'English','Subject:'); +INSERT INTO international VALUES (238,'English','Author:'); +INSERT INTO international VALUES (239,'English','Date:'); +INSERT INTO international VALUES (240,'English','Message ID:'); +INSERT INTO international VALUES (241,'English','Previous Thread'); +INSERT INTO international VALUES (242,'English','Back To Message List'); +INSERT INTO international VALUES (243,'English','Next Thread'); +INSERT INTO international VALUES (244,'English','Author'); +INSERT INTO international VALUES (245,'English','Date'); +INSERT INTO international VALUES (246,'English','Post New Message'); +INSERT INTO international VALUES (247,'English','Thread Started'); +INSERT INTO international VALUES (248,'English','Replies'); +INSERT INTO international VALUES (249,'English','Last Reply'); +INSERT INTO international VALUES (250,'English','Poll'); +INSERT INTO international VALUES (251,'English','Add Poll'); +INSERT INTO international VALUES (252,'English','Active'); +INSERT INTO international VALUES (253,'English','Who can vote?'); +INSERT INTO international VALUES (254,'English','Graph Width'); +INSERT INTO international VALUES (255,'English','Question'); +INSERT INTO international VALUES (256,'English','Answers'); +INSERT INTO international VALUES (257,'English','(Enter one answer per line. No more than 20.)'); +INSERT INTO international VALUES (258,'English','Edit Poll'); +INSERT INTO international VALUES (259,'English','SQL Report'); +INSERT INTO international VALUES (260,'English','Add SQL Report'); +INSERT INTO international VALUES (261,'English','Template'); +INSERT INTO international VALUES (262,'English','Query'); +INSERT INTO international VALUES (263,'English','DSN'); +INSERT INTO international VALUES (264,'English','Database User'); +INSERT INTO international VALUES (265,'English','Database Password'); +INSERT INTO international VALUES (266,'English','Edit SQL Report'); +INSERT INTO international VALUES (267,'English','Error: The DSN specified is of an improper format.'); +INSERT INTO international VALUES (268,'English','Error: The SQL specified is of an improper format.'); +INSERT INTO international VALUES (269,'English','Error: There was a problem with the query.'); +INSERT INTO international VALUES (270,'English','Error: Could not connect to the database.'); +INSERT INTO international VALUES (271,'English','Syndicated Content'); +INSERT INTO international VALUES (272,'English','Add Syndicated Content'); +INSERT INTO international VALUES (273,'English','URL to RSS File'); +INSERT INTO international VALUES (274,'English','Edit Syndicated Content'); +INSERT INTO international VALUES (275,'English','Last Fetched'); +INSERT INTO international VALUES (276,'English','Current Content'); +INSERT INTO international VALUES (277,'English','User Submission System'); +INSERT INTO international VALUES (278,'English','Add User Submission System'); +INSERT INTO international VALUES (279,'English','Who can contribute?'); +INSERT INTO international VALUES (280,'English','Submissions Per Page'); +INSERT INTO international VALUES (281,'English','Approved'); +INSERT INTO international VALUES (282,'English','Denied'); +INSERT INTO international VALUES (283,'English','Pending'); +INSERT INTO international VALUES (284,'English','Default Status'); +INSERT INTO international VALUES (285,'English','Add Submission'); +INSERT INTO international VALUES (286,'English','(Uncheck if you\'re writing an HTML submission.)'); +INSERT INTO international VALUES (287,'English','Date Submitted'); +INSERT INTO international VALUES (288,'English','Status'); +INSERT INTO international VALUES (289,'English','Edit/Delete'); +INSERT INTO international VALUES (290,'English','Untitiled'); +INSERT INTO international VALUES (291,'English','Are you certain you wish to delete this submission?'); +INSERT INTO international VALUES (292,'English','Edit User Submission System'); +INSERT INTO international VALUES (293,'English','Edit Submission'); +INSERT INTO international VALUES (294,'English','Post New Submission'); +INSERT INTO international VALUES (295,'English','Date Submitted'); +INSERT INTO international VALUES (296,'English','Submitted By'); +INSERT INTO international VALUES (297,'English','Submitted By:'); +INSERT INTO international VALUES (298,'English','Date Submitted:'); +INSERT INTO international VALUES (299,'English','Approve'); +INSERT INTO international VALUES (300,'English','Leave Pending'); +INSERT INTO international VALUES (301,'English','Deny'); +INSERT INTO international VALUES (302,'English','Edit'); +INSERT INTO international VALUES (303,'English','Return To Submissions List'); +INSERT INTO international VALUES (304,'English','Language'); + # # Table structure for table 'link' # @@ -531,6 +834,7 @@ INSERT INTO settings VALUES ('ldapPasswordName','LDAP Password'); INSERT INTO settings VALUES ('authMethod','WebGUI'); INSERT INTO settings VALUES ('anonymousRegistration','yes'); INSERT INTO settings VALUES ('notFoundPage','1'); +INSERT INTO settings VALUES ('recoverPasswordEmail','Someone (probably you) requested your account information be sent. Your password has been reset. The following represents your new account information:'); # # Table structure for table 'style' @@ -608,10 +912,11 @@ CREATE TABLE users ( username varchar(35) default NULL, 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, + language varchar(30) NOT NULL default 'English', + icq varchar(30) default NULL, PRIMARY KEY (userId) ) TYPE=MyISAM; @@ -619,31 +924,31 @@ CREATE TABLE users ( # Dumping data for table 'users' # -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); +INSERT INTO users VALUES (1,'Visitor','No Login','','WebGUI',NULL,NULL,'English',''); +INSERT INTO users VALUES (2,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (3,'Admin','RvlMjeFPs2aAhQdo/xt/Kg','','WebGUI',NULL,NULL,'English',''); +INSERT INTO users VALUES (4,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (5,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (6,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (7,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (8,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (9,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (10,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (11,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (12,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (13,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (14,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (15,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (16,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (17,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (18,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (19,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (20,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (21,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (22,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (23,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (24,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); +INSERT INTO users VALUES (25,'Reserved','No Login',NULL,'WebGUI',NULL,NULL,'English',NULL); # # Table structure for table 'widget' diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index b0fdd3f20..9783fbbc7 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -195,6 +195,7 @@ CREATE TABLE event ( description text, startDate int(11) default NULL, endDate int(11) default NULL, + recurringEventId int(11) NOT NULL default '0', PRIMARY KEY (eventId) ) TYPE=MyISAM; @@ -370,6 +371,7 @@ INSERT INTO incrementer VALUES ('eventId',1); INSERT INTO incrementer VALUES ('linkId',1); INSERT INTO incrementer VALUES ('questionId',1); INSERT INTO incrementer VALUES ('submissionId',1); +INSERT INTO incrementer VALUES ('recurringEventId',1); # # Table structure for table 'link' @@ -518,7 +520,7 @@ INSERT INTO settings VALUES ('maxAttachmentSize','300'); INSERT INTO settings VALUES ('lib','/extras'); 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 ('smtpServer','localhost'); 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'); diff --git a/docs/upgrade_1.3.1-2.0.0.sql b/docs/upgrade_1.3.1-2.0.0.sql deleted file mode 100644 index 759deae88..000000000 --- a/docs/upgrade_1.3.1-2.0.0.sql +++ /dev/null @@ -1,2 +0,0 @@ -alter table event add column recurringEventId int not null; -INSERT INTO incrementer VALUES ('recurringEventId',1); diff --git a/docs/upgrade_2.0.0-2.1.0.sql b/docs/upgrade_2.0.0-2.1.0.sql new file mode 100644 index 000000000..3c9b26f20 --- /dev/null +++ b/docs/upgrade_2.0.0-2.1.0.sql @@ -0,0 +1,323 @@ +alter table users add column icq_temp varchar(30); +update users set icq_temp=icq; +alter table users drop icq; +alter table users change icq_temp icq varchar(30); +alter table users add column language varchar(30) not null default 'English' after connectDN; +alter table Article change body body mediumtext; +INSERT INTO settings VALUES ('recoverPasswordEmail','Someone (probably you) requested your account information be sent. Your password has been reset. The following represents your new account information:'); + + +CREATE TABLE international ( + internationalId int(11) NOT NULL default '0', + language varchar(30) NOT NULL default 'English', + message text, + PRIMARY KEY (internationalId,language) +) TYPE=MyISAM; + +INSERT INTO international VALUES (1,'English','Add content...'); +INSERT INTO international VALUES (2,'English','Page'); +INSERT INTO international VALUES (3,'English','Paste from clipboard...'); +INSERT INTO international VALUES (4,'English','Manage settings.'); +INSERT INTO international VALUES (5,'English','Manage groups.'); +INSERT INTO international VALUES (6,'English','Manage styles.'); +INSERT INTO international VALUES (7,'English','Manage users.'); +INSERT INTO international VALUES (8,'English','View page not found.'); +INSERT INTO international VALUES (9,'English','View clipboard.'); +INSERT INTO international VALUES (10,'English','View trash.'); +INSERT INTO international VALUES (11,'English','Empy trash.'); +INSERT INTO international VALUES (12,'English','Turn admin off.'); +INSERT INTO international VALUES (13,'English','View help index.'); +INSERT INTO international VALUES (14,'English','View pending submissions.'); +INSERT INTO international VALUES (15,'English','January'); +INSERT INTO international VALUES (16,'English','February'); +INSERT INTO international VALUES (17,'English','March'); +INSERT INTO international VALUES (18,'English','April'); +INSERT INTO international VALUES (19,'English','May'); +INSERT INTO international VALUES (20,'English','June'); +INSERT INTO international VALUES (21,'English','July'); +INSERT INTO international VALUES (22,'English','August'); +INSERT INTO international VALUES (23,'English','September'); +INSERT INTO international VALUES (24,'English','October'); +INSERT INTO international VALUES (25,'English','November'); +INSERT INTO international VALUES (26,'English','December'); +INSERT INTO international VALUES (27,'English','Sunday'); +INSERT INTO international VALUES (28,'English','Monday'); +INSERT INTO international VALUES (29,'English','Tuesday'); +INSERT INTO international VALUES (30,'English','Wednesday'); +INSERT INTO international VALUES (31,'English','Thursday'); +INSERT INTO international VALUES (32,'English','Friday'); +INSERT INTO international VALUES (33,'English','Saturday'); +INSERT INTO international VALUES (34,'English','set date'); +INSERT INTO international VALUES (35,'English','Administrative Function'); +INSERT INTO international VALUES (36,'English','You must be an administrator to perform this function. Please contact one of your administrators. The following is a list of the administrators for this system:'); +INSERT INTO international VALUES (37,'English','Permission Denied!'); +INSERT INTO international VALUES (38,'English','You do not have sufficient privileges to perform this operation. Please log in with an account that has sufficient privileges before attempting this operation.'); +INSERT INTO international VALUES (39,'English','You do not have sufficient privileges to access this page.'); +INSERT INTO international VALUES (41,'English','You\'re attempting to remove a vital component of the WebGUI system. If you were allowed to continue WebGUI may cease to function.'); +INSERT INTO international VALUES (40,'English','Vital Component'); +INSERT INTO international VALUES (42,'English','Please Confirm'); +INSERT INTO international VALUES (43,'English','Are you certain that you wish to delete this content?'); +INSERT INTO international VALUES (44,'English','Yes, I\'m sure.'); +INSERT INTO international VALUES (45,'English','No, I made a mistake.'); +INSERT INTO international VALUES (46,'English','My Account'); +INSERT INTO international VALUES (47,'English','Home'); +INSERT INTO international VALUES (48,'English','Hello'); +INSERT INTO international VALUES (49,'English','Click here to log out.'); +INSERT INTO international VALUES (50,'English','Username'); +INSERT INTO international VALUES (51,'English','Password'); +INSERT INTO international VALUES (52,'English','login'); +INSERT INTO international VALUES (53,'English','Make Page Printable'); +INSERT INTO international VALUES (54,'English','Create Account'); +INSERT INTO international VALUES (55,'English','Password (confirm)'); +INSERT INTO international VALUES (56,'English','Email Address'); +INSERT INTO international VALUES (57,'English','This is only necessary if you wish to use features that require Email.'); +INSERT INTO international VALUES (58,'English','I already have an account.'); +INSERT INTO international VALUES (59,'English','I forgot my password.'); +INSERT INTO international VALUES (60,'English','Are you certain you want to deactivate your account. If you proceed your account information will be lost permanently.'); +INSERT INTO international VALUES (61,'English','Update Account Information'); +INSERT INTO international VALUES (62,'English','save'); +INSERT INTO international VALUES (63,'English','Turn admin on.'); +INSERT INTO international VALUES (64,'English','Log out.'); +INSERT INTO international VALUES (65,'English','Please deactivate my account permanently.'); +INSERT INTO international VALUES (66,'English','Log In'); +INSERT INTO international VALUES (67,'English','Create a new account.'); +INSERT INTO international VALUES (68,'English','The account information you supplied is invalid. Either the account does not exist or the username/password combination was incorrect.'); +INSERT INTO international VALUES (69,'English','Please contact your system administrator for assistance.'); +INSERT INTO international VALUES (70,'English','Error'); +INSERT INTO international VALUES (71,'English','Recover password'); +INSERT INTO international VALUES (72,'English','recover'); +INSERT INTO international VALUES (73,'English','Log in.'); +INSERT INTO international VALUES (74,'English','Account Information'); +INSERT INTO international VALUES (75,'English','Your account information has been sent to your email address.'); +INSERT INTO international VALUES (76,'English','That email address is not in our databases.'); +INSERT INTO international VALUES (77,'English','That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:'); +INSERT INTO international VALUES (78,'English','Your passwords did not match. Please try again.'); +INSERT INTO international VALUES (79,'English','Cannot connect to LDAP server.'); +INSERT INTO international VALUES (80,'English','Account created successfully!'); +INSERT INTO international VALUES (81,'English','Account updated successfully!'); +INSERT INTO international VALUES (82,'English','Administrative functions...'); +INSERT INTO international VALUES (83,'English','Add Group'); +INSERT INTO international VALUES (84,'English','Group Name'); +INSERT INTO international VALUES (85,'English','Description'); +INSERT INTO international VALUES (86,'English','Are you certain you wish to delete this group? Beware that deleting a group is permanent and will remove all privileges associated with this group.'); +INSERT INTO international VALUES (87,'English','Edit Group'); +INSERT INTO international VALUES (88,'English','Users In Group'); +INSERT INTO international VALUES (89,'English','Groups'); +INSERT INTO international VALUES (90,'English','Add new group.'); +INSERT INTO international VALUES (91,'English','Previous Page'); +INSERT INTO international VALUES (92,'English','Next Page'); +INSERT INTO international VALUES (93,'English','Help'); +INSERT INTO international VALUES (94,'English','See also'); +INSERT INTO international VALUES (95,'English','Help Index'); +INSERT INTO international VALUES (96,'English','Sorted By Action'); +INSERT INTO international VALUES (97,'English','Sorted by Object'); +INSERT INTO international VALUES (98,'English','Add Page'); +INSERT INTO international VALUES (99,'English','Title'); +INSERT INTO international VALUES (100,'English','Meta Tags'); +INSERT INTO international VALUES (101,'English','Are you certain that you wish to delete this page, its content, and all items under it?'); +INSERT INTO international VALUES (102,'English','Edit Page'); +INSERT INTO international VALUES (103,'English','Page Specifics'); +INSERT INTO international VALUES (104,'English','Page URL'); +INSERT INTO international VALUES (105,'English','Style'); +INSERT INTO international VALUES (106,'English','Check to give this style to all sub-pages.'); +INSERT INTO international VALUES (107,'English','Privileges'); +INSERT INTO international VALUES (108,'English','Owner'); +INSERT INTO international VALUES (109,'English','Owner can view?'); +INSERT INTO international VALUES (110,'English','Owner can edit?'); +INSERT INTO international VALUES (111,'English','Group'); +INSERT INTO international VALUES (112,'English','Group can view?'); +INSERT INTO international VALUES (113,'English','Group can edit?'); +INSERT INTO international VALUES (114,'English','Anybody can view?'); +INSERT INTO international VALUES (115,'English','Anybody can edit?'); +INSERT INTO international VALUES (116,'English','Check to give these privileges to all sub-pages.'); +INSERT INTO international VALUES (117,'English','Edit Authentication Settings'); +INSERT INTO international VALUES (118,'English','Anonymous Registration'); +INSERT INTO international VALUES (119,'English','Authentication Method (default)'); +INSERT INTO international VALUES (120,'English','LDAP URL (default)'); +INSERT INTO international VALUES (121,'English','LDAP Identity (default)'); +INSERT INTO international VALUES (122,'English','LDAP Identity Name'); +INSERT INTO international VALUES (123,'English','LDAP Password Name'); +INSERT INTO international VALUES (124,'English','Edit Company Information'); +INSERT INTO international VALUES (125,'English','Company Name'); +INSERT INTO international VALUES (126,'English','Company Email Address'); +INSERT INTO international VALUES (127,'English','Company URL'); +INSERT INTO international VALUES (128,'English','Edit File Settings'); +INSERT INTO international VALUES (129,'English','Path to WebGUI Extras'); +INSERT INTO international VALUES (130,'English','Maximum Attachment Size'); +INSERT INTO international VALUES (131,'English','Web Attachment Path'); +INSERT INTO international VALUES (132,'English','Server Attachment Path'); +INSERT INTO international VALUES (133,'English','Edit Mail Settings'); +INSERT INTO international VALUES (134,'English','Recover Password Message'); +INSERT INTO international VALUES (135,'English','SMTP Server'); +INSERT INTO international VALUES (136,'English','Home Page'); +INSERT INTO international VALUES (137,'English','Page Not Found Page'); +INSERT INTO international VALUES (138,'English','Yes'); +INSERT INTO international VALUES (139,'English','No'); +INSERT INTO international VALUES (140,'English','Edit Miscellaneous Settings'); +INSERT INTO international VALUES (141,'English','Not Found Page'); +INSERT INTO international VALUES (142,'English','Session Timeout'); +INSERT INTO international VALUES (143,'English','Manage Settings'); +INSERT INTO international VALUES (144,'English','View Statistics'); +INSERT INTO international VALUES (145,'English','WebGUI Build Version'); +INSERT INTO international VALUES (146,'English','Active Sessions'); +INSERT INTO international VALUES (147,'English','Viewable Pages'); +INSERT INTO international VALUES (148,'English','Viewable Widgets'); +INSERT INTO international VALUES (149,'English','Users'); +INSERT INTO international VALUES (150,'English','Add Style'); +INSERT INTO international VALUES (151,'English','Style Name'); +INSERT INTO international VALUES (152,'English','Header'); +INSERT INTO international VALUES (153,'English','Footer'); +INSERT INTO international VALUES (154,'English','Style Sheet'); +INSERT INTO international VALUES (155,'English','Are you certain you wish to delete this style and migrate all pages using this style to the \"Fail Safe\" style?'); +INSERT INTO international VALUES (156,'English','Edit Style'); +INSERT INTO international VALUES (157,'English','Styles'); +INSERT INTO international VALUES (158,'English','Add a new style.'); +INSERT INTO international VALUES (159,'English','Pending Submissions'); +INSERT INTO international VALUES (160,'English','Date Submitted'); +INSERT INTO international VALUES (161,'English','Submitted By'); +INSERT INTO international VALUES (162,'English','Are you certain that you wish to purge all the pages and widgets in the trash?'); +INSERT INTO international VALUES (163,'English','Add User'); +INSERT INTO international VALUES (164,'English','Authentication Method'); +INSERT INTO international VALUES (165,'English','LDAP URL'); +INSERT INTO international VALUES (166,'English','Connect DN'); +INSERT INTO international VALUES (167,'English','Are you certain you want to delete this user? Be warned that all this user\'s information will be lost permanently if you choose to proceed.'); +INSERT INTO international VALUES (168,'English','Edit User'); +INSERT INTO international VALUES (169,'English','Add a new user.'); +INSERT INTO international VALUES (170,'English','search'); +INSERT INTO international VALUES (171,'English','rich edit'); +INSERT INTO international VALUES (172,'English','Article'); +INSERT INTO international VALUES (173,'English','Add Article'); +INSERT INTO international VALUES (174,'English','Display the title?'); +INSERT INTO international VALUES (175,'English','Process macros?'); +INSERT INTO international VALUES (176,'English','Start Date'); +INSERT INTO international VALUES (177,'English','End Date'); +INSERT INTO international VALUES (178,'English','Body'); +INSERT INTO international VALUES (179,'English','Image'); +INSERT INTO international VALUES (180,'English','Link Title'); +INSERT INTO international VALUES (181,'English','Link URL'); +INSERT INTO international VALUES (182,'English','Attachment'); +INSERT INTO international VALUES (183,'English','Convert carriage returns?'); +INSERT INTO international VALUES (184,'English','(Check if you aren\'t adding <br> manually.)'); +INSERT INTO international VALUES (185,'English','Edit Article'); +INSERT INTO international VALUES (186,'English','Delete'); +INSERT INTO international VALUES (187,'English','Events Calendar'); +INSERT INTO international VALUES (188,'English','Add Events Calendar'); +INSERT INTO international VALUES (189,'English','Happens only once.'); +INSERT INTO international VALUES (190,'English','Day'); +INSERT INTO international VALUES (191,'English','Week'); +INSERT INTO international VALUES (192,'English','Add Event'); +INSERT INTO international VALUES (193,'English','Recurs every'); +INSERT INTO international VALUES (194,'English','until'); +INSERT INTO international VALUES (195,'English','Are you certain that you want to delete this event'); +INSERT INTO international VALUES (197,'English','Edit Events Calendar'); +INSERT INTO international VALUES (196,'English','and all of its recurring events'); +INSERT INTO international VALUES (198,'English','Edit Event'); +INSERT INTO international VALUES (199,'English','Extra Column'); +INSERT INTO international VALUES (200,'English','Add Extra Column'); +INSERT INTO international VALUES (201,'English','Spacer'); +INSERT INTO international VALUES (202,'English','Width'); +INSERT INTO international VALUES (203,'English','StyleSheet Class'); +INSERT INTO international VALUES (204,'English','Edit Extra Column'); +INSERT INTO international VALUES (205,'English','F.A.Q.'); +INSERT INTO international VALUES (206,'English','Add F.A.Q.'); +INSERT INTO international VALUES (207,'English','Add Question'); +INSERT INTO international VALUES (208,'English','Question'); +INSERT INTO international VALUES (209,'English','Answer'); +INSERT INTO international VALUES (211,'English','Edit F.A.Q.'); +INSERT INTO international VALUES (210,'English','Are you certain that you want to delete this question?'); +INSERT INTO international VALUES (212,'English','Add a new question.'); +INSERT INTO international VALUES (213,'English','Edit Question'); +INSERT INTO international VALUES (214,'English','Link List'); +INSERT INTO international VALUES (215,'English','Add Link'); +INSERT INTO international VALUES (216,'English','URL'); +INSERT INTO international VALUES (217,'English','Are you certain that you want to delete this link?'); +INSERT INTO international VALUES (218,'English','Edit Link List'); +INSERT INTO international VALUES (219,'English','Add Link List'); +INSERT INTO international VALUES (220,'English','Edit Link'); +INSERT INTO international VALUES (221,'English','Add a new link.'); +INSERT INTO international VALUES (222,'English','Add Message Board'); +INSERT INTO international VALUES (223,'English','Message Board'); +INSERT INTO international VALUES (224,'English','Who can post?'); +INSERT INTO international VALUES (225,'English','Messages Per Page'); +INSERT INTO international VALUES (226,'English','Edit Timeout'); +INSERT INTO international VALUES (227,'English','Edit Message Board'); +INSERT INTO international VALUES (228,'English','Editing Message...'); +INSERT INTO international VALUES (229,'English','Subject'); +INSERT INTO international VALUES (230,'English','Message'); +INSERT INTO international VALUES (231,'English','Posting New Message...'); +INSERT INTO international VALUES (232,'English','no subject'); +INSERT INTO international VALUES (233,'English','(eom)'); +INSERT INTO international VALUES (234,'English','Posting Reply...'); +INSERT INTO international VALUES (235,'English','Edit Message'); +INSERT INTO international VALUES (236,'English','Post Reply'); +INSERT INTO international VALUES (237,'English','Subject:'); +INSERT INTO international VALUES (238,'English','Author:'); +INSERT INTO international VALUES (239,'English','Date:'); +INSERT INTO international VALUES (240,'English','Message ID:'); +INSERT INTO international VALUES (241,'English','Previous Thread'); +INSERT INTO international VALUES (242,'English','Back To Message List'); +INSERT INTO international VALUES (243,'English','Next Thread'); +INSERT INTO international VALUES (244,'English','Author'); +INSERT INTO international VALUES (245,'English','Date'); +INSERT INTO international VALUES (246,'English','Post New Message'); +INSERT INTO international VALUES (247,'English','Thread Started'); +INSERT INTO international VALUES (248,'English','Replies'); +INSERT INTO international VALUES (249,'English','Last Reply'); +INSERT INTO international VALUES (250,'English','Poll'); +INSERT INTO international VALUES (251,'English','Add Poll'); +INSERT INTO international VALUES (252,'English','Active'); +INSERT INTO international VALUES (253,'English','Who can vote?'); +INSERT INTO international VALUES (254,'English','Graph Width'); +INSERT INTO international VALUES (255,'English','Question'); +INSERT INTO international VALUES (256,'English','Answers'); +INSERT INTO international VALUES (257,'English','(Enter one answer per line. No more than 20.)'); +INSERT INTO international VALUES (258,'English','Edit Poll'); +INSERT INTO international VALUES (259,'English','SQL Report'); +INSERT INTO international VALUES (260,'English','Add SQL Report'); +INSERT INTO international VALUES (261,'English','Template'); +INSERT INTO international VALUES (262,'English','Query'); +INSERT INTO international VALUES (263,'English','DSN'); +INSERT INTO international VALUES (264,'English','Database User'); +INSERT INTO international VALUES (265,'English','Database Password'); +INSERT INTO international VALUES (266,'English','Edit SQL Report'); +INSERT INTO international VALUES (267,'English','Error: The DSN specified is of an improper format.'); +INSERT INTO international VALUES (268,'English','Error: The SQL specified is of an improper format.'); +INSERT INTO international VALUES (269,'English','Error: There was a problem with the query.'); +INSERT INTO international VALUES (270,'English','Error: Could not connect to the database.'); +INSERT INTO international VALUES (271,'English','Syndicated Content'); +INSERT INTO international VALUES (272,'English','Add Syndicated Content'); +INSERT INTO international VALUES (273,'English','URL to RSS File'); +INSERT INTO international VALUES (274,'English','Edit Syndicated Content'); +INSERT INTO international VALUES (275,'English','Last Fetched'); +INSERT INTO international VALUES (276,'English','Current Content'); +INSERT INTO international VALUES (277,'English','User Submission System'); +INSERT INTO international VALUES (278,'English','Add User Submission System'); +INSERT INTO international VALUES (279,'English','Who can contribute?'); +INSERT INTO international VALUES (280,'English','Submissions Per Page'); +INSERT INTO international VALUES (281,'English','Approved'); +INSERT INTO international VALUES (282,'English','Denied'); +INSERT INTO international VALUES (283,'English','Pending'); +INSERT INTO international VALUES (284,'English','Default Status'); +INSERT INTO international VALUES (285,'English','Add Submission'); +INSERT INTO international VALUES (286,'English','(Uncheck if you\'re writing an HTML submission.)'); +INSERT INTO international VALUES (287,'English','Date Submitted'); +INSERT INTO international VALUES (288,'English','Status'); +INSERT INTO international VALUES (289,'English','Edit/Delete'); +INSERT INTO international VALUES (290,'English','Untitiled'); +INSERT INTO international VALUES (291,'English','Are you certain you wish to delete this submission?'); +INSERT INTO international VALUES (292,'English','Edit User Submission System'); +INSERT INTO international VALUES (293,'English','Edit Submission'); +INSERT INTO international VALUES (294,'English','Post New Submission'); +INSERT INTO international VALUES (295,'English','Date Submitted'); +INSERT INTO international VALUES (296,'English','Submitted By'); +INSERT INTO international VALUES (297,'English','Submitted By:'); +INSERT INTO international VALUES (298,'English','Date Submitted:'); +INSERT INTO international VALUES (299,'English','Approve'); +INSERT INTO international VALUES (300,'English','Leave Pending'); +INSERT INTO international VALUES (301,'English','Deny'); +INSERT INTO international VALUES (302,'English','Edit'); +INSERT INTO international VALUES (303,'English','Return To Submissions List'); +INSERT INTO international VALUES (304,'English','Language'); + + + diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original new file mode 100644 index 000000000..cbe1dd612 --- /dev/null +++ b/etc/WebGUI.conf.original @@ -0,0 +1,4 @@ +dsn = DBI:mysql:WebGUI +dbuser = webgui +dbpass = password +logfile = /data/webgui.log diff --git a/extras/ieEdit.html b/extras/ieEdit.html new file mode 100644 index 000000000..82bb5d7fc --- /dev/null +++ b/extras/ieEdit.html @@ -0,0 +1,537 @@ + +
+ + + + + + + +| + | + | + | |
| "+ " | "+ L_CLOSEBUTTON_TEXT+ " | "+ "
|---|
| " ++ "" ++ L_STYLESAMPLE_TEXT ++ "" ++ " | " ++ "
| " ++ "" ++ defaultFonts[i][1] ++ "" ++ (defaultFonts[i][2] ? ("(" + defaultFonts[i][1] + ")") : "") ++ " | " ++ "
| " + L_CUSTOMFONT_TEXT + " |
", L_STYLENORMAL_TEXT) +defaultParagraphs[1] = new Array("
", L_STYLEFORMATTED_TEXT)
+for (var i=2; i <= 7; i++)
+defaultParagraphs[i] = new Array("", L_STYLEHEADING_TEXT + (i-1))
+sz = ""
+for (var i=0; i < defaultParagraphs.length; i++)
+{
+sz += ""
++ ""
++ ""
++ defaultParagraphs[i][0]
++ defaultParagraphs[i][1]
++ "" + defaultParagraphs[i][0].substring(1)
++ " "
++ " "
+}
+sz += "
"
+return sz
+}
+function _CTablePopupRenderer_PrepareHTMLPage(szID,bDisplay) {
+var sz=""
++ ""
++ ""
++ ""
++ ""
++ L_TABLEROWSANDCOLS_TEXT
++ ""
++ "
"
++ ""
++ L_TABLEPADDINGANDSPACING_TEXT
++ ""
++ "
"
++ ""
++ L_TABLEBORDERS_TEXT
++ ""
++ "
"
++ ""
++ L_TABLEBG_TEXT
++ ""
++ "
"
++ " "
++ ""
++ " "
++ ""
+if (szID=="tabNewBody") {
+sz+= ""
++ "" + L_TABLEROWSANDCOLS_TEXT + "
"
++ ""
++ L_TABLEINPUTROWS_TEXT
++ " "
++ " "
++ L_TABLEINPUTCOLUMNS_TEXT
++ " "
++ "
"
+}
+else {
+sz+= ""
++ "" + L_TABLEROWSANDCOLS_TEXT + "
"
++ ""
++ "
"
++ "
"
+}
+sz += ""
++ "" + L_TABLEPADDINGANDSPACING_TEXT + "
"
++ L_TABLEINPUTCELLPADDING_TEXT
++ ""
++ "
"
++ L_TABLEINPUTCELLSPACING_TEXT
++ ""
++ ""
++ ""
++ "" + L_TABLEBORDERS_TEXT + "
"
++ L_TABLEINPUTBORDER_TEXT
++ ""
++ "
"
++ L_TABLEINPUTBORDERCOLOR_TEXT
++ "
"
++ _CUtil_BuildColorTable("idBorder"+szID, "", "parent._CTablePopupRenderer_ColorSelect(this,'" + szID + "txtBorderColor')")
++ ""
++ ""
++ "" + L_TABLEBG_TEXT + "
"
++ L_TABLEINPUTBGIMGURL_TEXT
++ ""
++ "
"
++ L_TABLEINPUTBGCOLOR_TEXT
++ "
"
++ _CUtil_BuildColorTable("idBackground"+szID, "", "parent._CTablePopupRenderer_ColorSelect(this,'" + szID + "txtBackgroundColor')")
++ ""
++ " "
++ " "
+if (szID=="tabNewBody") {
+sz += ""
++ " "
+} else {
+sz += ""
++ " "
+}
+sz+= "
"
+return sz
+}
+function _CTablePopupRenderer_PrepareHTML()
+{
+var sz = "New Table "
++ "Edit Table "
++ _CTablePopupRenderer_PrepareHTMLPage("tabNewBody",true)
++ _CTablePopupRenderer_PrepareHTMLPage("tabEditBody",false)
++ "
"
+return sz
+}
+function _CTablePopupRenderer_Select(el,szID, id)
+{
+var d = el.document
+for (var i = 1; i < 5; i++)
+d.all[szID + "prop" + i].style.display = "none"
+d.all[szID + id].style.display = ""
+}
+function _CTablePopupRenderer_ColorSelect(el,id)
+{
+el.document.all[id].value = el.bgColor
+}
+function _CTablePopupRenderer_AddRow(el) {
+var elRow = el.document.elCurrent.insertRow()
+for (var i=0;i"
+for (var r=0; r < d.all[szID + "txtRows"].value; r++)
+{
+sz += ""
+for (var c=0; c < d.all[szID + "txtColumns"].value; c++)
+sz += " "
+sz += " "
+}
+sz += ""
+insertHTML(sz)
+} else
+if (d.elCurrent) {
+d.elCurrent.cellPadding = d.all.tabEditBodytxtPadding.value
+d.elCurrent.cellSpacing = d.all.tabEditBodytxtSpacing.value
+d.elCurrent.border = d.all.tabEditBodytxtBorder.value
+d.elCurrent.className = (d.elCurrent.border=="" || d.elCurrent.border==0) ? "NOBORDER" : ""
+d.elCurrent.borderColor = d.all.tabEditBodytxtBorderColor.value
+d.elCurrent.bgColor = d.all.tabEditBodytxtBackgroundColor.value
+d.elCurrent.background = d.all.tabEditBodytxtBackgroundImage.value
+}
+_CPopup_Hide()
+}
+function _CListPopupRenderer_OnClick()
+{
+var elTD = _CUtil_GetElement(this.oDocument.parentWindow.event.srcElement, "TD")
+if (elTD && elTD._item) this.Select(elTD)
+}
+function _CListPopupRenderer_GenericOnKeyDown() {
+var ev = this.oDocument.parentWindow.event
+if (ev.keyCode==27) _CPopup_Hide()
+}
+function _CListPopupRenderer_OnKeyDown()
+{
+var el
+var iRow = iCell = 0
+var ev = this.oDocument.parentWindow.event
+var idList = this.oDocument.all.idList
+var elTR = _CUtil_GetElement(this.elCurrent,"TR")
+var elTD = _CUtil_GetElement(this.elCurrent,"TD")
+if (elTR != null)
+{
+iRow = elTR.rowIndex
+iCell = elTD.cellIndex
+}
+switch (ev.keyCode)
+{
+case 37:
+iCell--
+if (iCell < 0)
+iCell = idList.rows[iRow].cells.length-1
+break
+case 38:
+iRow--
+if (iRow < 0)
+iRow = idList.rows.length-1
+break
+case 39:
+iCell++
+if (iCell > idList.rows[iRow].cells.length-1)
+iCell = 0
+break
+case 40:
+iRow++
+if (iRow > idList.rows.length-1)
+iRow = 0
+break
+case 13:
+break;
+case 27:
+_CPopup_Hide()
+break;
+default:
+return;
+}
+el = idList.rows[iRow].cells[iCell]
+if (el && el._item)
+if (13 == ev.keyCode) {
+ev.keyCode=0
+this.Select(el)
+}
+else
+this.Highlight(el)
+}
+function _CListPopupRenderer_OnMouseOver()
+{
+var el = _CUtil_GetElement(this.oDocument.parentWindow.event.srcElement, "TD")
+if (el && el._item && el != this.elCurrent)
+this.Highlight(el)
+}
+function _CListPopupRenderer_Highlight(el)
+{
+var elC = this.elCurrent
+if (elC) elC.style.borderWidth = elC.style.borderColor = elC.style.borderStyle = ""
+el.style.borderWidth = "1px"
+el.style.borderColor = "green"
+el.style.borderStyle = "solid"
+this.elCurrent = el
+}
+function _CListPopupRenderer_Select(elTD)
+{
+g_state.RestoreSelection()
+var el = elTD.children[0]
+switch (this.szType)
+{
+case "font":
+_Format("FontName",el.face)
+break
+case "fontsize":
+_Format("FontSize",el.size)
+break
+case "formatblock":
+_Format("FormatBlock","<" + el.tagName + ">")
+break
+case "ForeColor":
+_Format("ForeColor", elTD.bgColor)
+break
+case "BackColor":
+_Format("BackColor",elTD.bgColor)
+break
+}
+_CPopup_Hide()
+}
+function _CLinkPopupRenderer_AddLink(d)
+{
+var szURL = d.all.urlValue.value
+var szType = d.all.urlType[d.all.urlType.selectedIndex].text
+var oSel = g_state.GetSelection()
+var sType = oSel.type
+szURL = ((0 == szURL.indexOf("mailto:") || 0 == szURL.indexOf("http://") || 0 == szURL.indexOf("ftp://")) ? "" : szType) + szURL
+if (szURL!="")
+{
+if ((oSel.parentElement) && (oSel.text==""))
+{
+oSel.expand("word")
+if (oSel.text=="")
+{
+var oStore = oSel.duplicate()
+if (d.all.pageList) {
+var idx = d.all.pageList.selectedIndex
+if (d.all.pageList[idx].value==szURL)
+oSel.text = d.all.pageList[idx].text
+else
+oSel.text = szURL
+}
+else
+oSel.text = szURL
+oSel.setEndPoint("StartToStart",oStore)
+}
+oSel.select()
+sType="Text"
+}
+if ((oSel.item) && (oSel.item(0).tagName=="IMG"))
+{
+oSel.item(0).width = oSel.item(0).offsetWidth
+oSel.item(0).height = oSel.item(0).offsetHeight
+oSel.item(0).border = (d.all.displayBorder.checked) ? 1 : ""
+}
+if (d.all.urlValue.value!="")
+oSel.execCommand("CreateLink",false,szURL)
+else
+oSel.execCommand("UnLink",false,szURL)
+}
+idEditbox.focus()
+}
+function _CLinkPopupRenderer__UpdateURL(oDoc,szURL) {
+var szType = szURL.substring(0,szURL.indexOf(":"))
+for (var i=0;i"
+if (g_state.aLinks.length>0)
+{
+sz += ""
++ ""
++ ""
++ L_LINKSELECT_TEXT
++ ""
+}
+var arTypes = new Array("http","ftp","mailto")
+var arText = new Array("http://","ftp://","mailto:")
+var szType = szURL.substring(0,szURL.indexOf(":"))
+if (("http"==szType) || ("ftp"==szType))
+szURL = szURL.substring(szURL.indexOf("//")+2)
+else
+szURL = szURL.substring(szURL.indexOf(":")+1)
+sz += ""
++ "
"
++ L_LINKWEB_TEXT
++ " "
+if (bImg)
+{
+sz += ""
++ "
"
++ ""
++ L_LINKIMGBORDER_TEXT
+}
+sz += ""
++ " "
++ " "
++ ""
++ ""
++ " "
++ " "
++ " "
++ ""
+return sz
+}
+// UTIL
+function _CUtil_GetElement(oEl,sTag)
+{
+while (oEl!=null && oEl.tagName!=sTag)
+oEl = oEl.parentElement
+return oEl
+}
+function _CUtil_BuildColorTable(sID,fmt,szClick)
+{
+var sz, cPick = new Array("00","33","66","99","CC","FF"), iCnt=2
+var iColors = cPick.length, szColor = ""
+sz = " "
++ ""
+for (var r=0;r"
+for (var g=iColors-1;g>=0;g--)
+for (var b=iColors-1;b>=0;b--) {
+szColor = cPick[r]+cPick[g]+cPick[b]
+sz+=" "
+}
+sz+=""
+}
+sz+="
"
+return sz
+}
+function _CUtil_GetBlock(oEl)
+{
+var sBlocks = "|H1|H2|H3|H4|H5|H6|P|PRE|LI|TD|DIV|BLOCKQUOTE|DT|DD|TABLE|HR|IMG|"
+while ((oEl!=null) && (sBlocks.indexOf("|"+oEl.tagName+"|")==-1))
+oEl = oEl.parentElement
+return oEl
+}
diff --git a/extras/nonIeEdit.html b/extras/nonIeEdit.html
new file mode 100644
index 000000000..ad6cde14d
--- /dev/null
+++ b/extras/nonIeEdit.html
@@ -0,0 +1,109 @@
+
+
+Edit Window
+
+
+
+
+
+
diff --git a/extras/nonIeEdit.js b/extras/nonIeEdit.js
new file mode 100644
index 000000000..b22ffc1c9
--- /dev/null
+++ b/extras/nonIeEdit.js
@@ -0,0 +1,82 @@
+/*
+
+#-------------------------------------------------------------------
+# 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
+#-------------------------------------------------------------------
+
+*/
+
+var color;
+var formObj;
+
+function boldText(obj) {
+ obj.value = obj.value+''+prompt("Enter the text to bold:", "")+'';
+}
+
+function centerText(obj) {
+ obj.value = obj.value+''+prompt("Enter the text to center:", "")+'';
+}
+
+function colorText(obj) {
+ formObj = obj;
+ window.open("/extras/colorPicker.html","colorPicker","width=438,height=258");
+}
+
+function copyright(obj) {
+ obj.value = obj.value+'©';
+}
+
+function email(obj) {
+ var email = prompt("Enter the Email address:", "");
+ obj.value = obj.value+''+email+'';
+}
+
+function getShowMeText() {
+ return formObj.value;
+}
+
+function imageAdd(obj) {
+ obj.value = obj.value+'
';
+}
+
+function italicText(obj) {
+ obj.value = obj.value+''+prompt("Enter the text to italicize:", "")+'';
+}
+
+function list(obj) {
+ var item;
+ obj.value = obj.value+'';
+ obj.value = obj.value+'- '+prompt("Enter the first item in the list:", "");
+ while (item = prompt("Enter the next item in the list (cancel when done):", "")) {
+ obj.value = obj.value+'
- '+item;
+ }
+ obj.value = obj.value+'
';
+}
+
+function registered(obj) {
+ obj.value = obj.value+'®';
+}
+
+function setColor(remoteColor) {
+ formObj.value = formObj.value+''+prompt("Enter the text to color:","")+'';
+}
+
+function showMe(obj) {
+ formObj = obj;
+ window.open("/extras/viewer.html","showMeViewer","width=500,height=300,scrollbars=1");
+}
+
+function trademark(obj) {
+ obj.value = obj.value+'TM';
+}
+
+function url(obj) {
+ obj.value = obj.value+''+prompt("Enter the title of the link:", "Google")+'';
+}
+
diff --git a/extras/toolbar.gif b/extras/toolbar.gif
new file mode 100644
index 000000000..9f61f3349
Binary files /dev/null and b/extras/toolbar.gif differ
diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index cae2422d1..5e4124e3d 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -1,5 +1,5 @@
package WebGUI;
-our $VERSION = "2.0.0";
+our $VERSION = "2.1.0";
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -15,6 +15,7 @@ use strict qw(vars subs);
use Tie::CPHash;
use Tie::IxHash;
use WebGUI::ErrorHandler;
+use WebGUI::International;
use WebGUI::Operation;
use WebGUI::Privilege;
use WebGUI::Session;
@@ -28,15 +29,16 @@ sub _displayAdminBar {
tie %hash2, "Tie::IxHash";
#--content adder
@widgetArray = @_;
- $hash2{$session{page}{url}} = "Add content...";
- $hash2{$session{page}{url}.'?op=addPage'} = 'Page';
+ $hash2{$session{page}{url}} = WebGUI::International::get(1);
+ $hash2{$session{page}{url}.'?op=addPage'} = WebGUI::International::get(2);
foreach $widget (@widgetArray) {
$widgetName = "WebGUI::Widget::".$widget."::widgetName";
$hash2{$session{page}{url}.'?func=add&widget='.$widget} = &$widgetName;
}
$contentSelect = WebGUI::Form::selectList("contentSelect",\%hash2,"","","","goContent()");
#--clipboard paster
- %hash2 = ( $session{page}{url}=> "Paste from clipboard..." );
+ %hash2 = ();
+ $hash2{$session{page}{url}} = WebGUI::International::get(3);
%hash = WebGUI::SQL->buildHash("select pageId,title from page where parentId=2 order by title",$session{dbh});
foreach $key (keys %hash) {
$hash2{$session{page}{url}.'?op=pastePage&pageId='.$key} = $hash{$key};
@@ -50,20 +52,20 @@ sub _displayAdminBar {
%hash = ();
if (WebGUI::Privilege::isInGroup(3,$session{user}{userId})) {
%hash = (
- $session{page}{url}.'?op=editSettings'=>'Edit Settings',
- $session{page}{url}.'?op=listGroups'=>'Manage Groups',
- $session{page}{url}.'?op=listStyles'=>'Manage Styles',
- $session{page}{url}.'?op=listUsers'=>'Manage Users',
- $session{env}{SCRIPT_NAME}.'/page_not_found'=>'View Page Not Found',
- $session{env}{SCRIPT_NAME}.'/clipboard'=>'View Clipboard',
- $session{env}{SCRIPT_NAME}.'/trash'=>'View Trash',
- $session{page}{url}.'?op=purgeTrash'=>'Empty Trash'
+ $session{page}{url}.'?op=listGroups'=>WebGUI::International::get(5),
+ $session{page}{url}.'?op=manageSettings'=>WebGUI::International::get(4),
+ $session{page}{url}.'?op=listStyles'=>WebGUI::International::get(6),
+ $session{page}{url}.'?op=listUsers'=>WebGUI::International::get(7),
+ $session{env}{SCRIPT_NAME}.'/page_not_found'=>WebGUI::International::get(8),
+ $session{env}{SCRIPT_NAME}.'/clipboard'=>WebGUI::International::get(9),
+ $session{env}{SCRIPT_NAME}.'/trash'=>WebGUI::International::get(10),
+ $session{page}{url}.'?op=purgeTrash'=>WebGUI::International::get(11)
);
}
- %hash = ( $session{page}{url}=>'Admin...',
- $session{page}{url}.'?op=switchOffAdmin'=>'Turn Admin Off',
- $session{page}{url}.'?op=viewHelpIndex'=>'View Help Index',
- $session{page}{url}.'?op=viewPendingSubmissions'=>'View Pending Submissions',
+ %hash = ( $session{page}{url}=>WebGUI::International::get(82),
+ $session{page}{url}.'?op=switchOffAdmin'=>WebGUI::International::get(12),
+ $session{page}{url}.'?op=viewHelpIndex'=>WebGUI::International::get(13),
+ $session{page}{url}.'?op=viewPendingSubmissions'=>WebGUI::International::get(14),
%hash
);
$adminSelect = WebGUI::Form::selectList("adminSelect",\%hash,"","","","goAdmin()");
@@ -91,8 +93,13 @@ sub _displayAdminBar {
#-------------------------------------------------------------------
sub _loadWidgets {
- my (@files, $file, $use, @widget, $i);
- opendir (DIR,$session{config}{webguiRoot}."/lib/WebGUI/Widget") or WebGUI::ErrorHandler::fatalError("Can't open widget directory!");
+ my ($widgetDir, @files, $file, $use, @widget, $i);
+ if ($^O =~ /Win/i) {
+ $widgetDir = "\\lib\\WebGUI\\Widget";
+ } else {
+ $widgetDir = "/lib/WebGUI/Widget";
+ }
+ opendir (DIR,$session{config}{webguiRoot}.$widgetDir) or WebGUI::ErrorHandler::fatalError("Can't open widget directory!");
@files = readdir(DIR);
foreach $file (@files) {
if ($file ne "." && $file ne ".." && $file =~ /\.pm/) {
@@ -146,7 +153,7 @@ sub page {
}
$sth->finish;
} else {
- $content = ' Permission Denied!
You do not have sufficient privileges to access this page. ';
+ $content = WebGUI::Privilege::noAccess();
}
}
if ($session{var}{adminOn}) {
diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index 467396ded..632bcf3de 100644
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -13,36 +13,47 @@ package WebGUI::DateTime;
use Exporter;
use strict;
use Time::Local;
+use WebGUI::International;
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 _getMonth {
+ my %month = (
+ 1=> WebGUI::International::get(15),
+ 2=> WebGUI::International::get(16),
+ 3=> WebGUI::International::get(17),
+ 4=> WebGUI::International::get(18),
+ 5=> WebGUI::International::get(19),
+ 6=> WebGUI::International::get(20),
+ 7=> WebGUI::International::get(21),
+ 8=> WebGUI::International::get(22),
+ 9=> WebGUI::International::get(23),
+ 10=> WebGUI::International::get(24),
+ 11=> WebGUI::International::get(25),
+ 12=> WebGUI::International::get(26)
);
+ return %month;
+}
+
+#-------------------------------------------------------------------
+sub _getWeekday {
+ my %weekday = (
+ 1=> WebGUI::International::get(27),
+ 2=> WebGUI::International::get(28),
+ 3=> WebGUI::International::get(29),
+ 4=> WebGUI::International::get(30),
+ 5=> WebGUI::International::get(31),
+ 6=> WebGUI::International::get(32),
+ 7=> WebGUI::International::get(33)
+ );
+ return %weekday;
+}
#-------------------------------------------------------------------
sub epochToHuman {
- my ($hour12, $value, $output, @date);
+ my ($hour12, $value, $output, @date, %weekday, %month);
@date = localtime($_[0]);
$date[4]++; # offset the months starting from 0
$date[5] += 1900; # original value is Year-1900
@@ -58,12 +69,18 @@ sub epochToHuman {
$value = sprintf("%02d",$date[4]);
$output =~ s/\%m/$value/g;
$output =~ s/\%M/$date[4]/g;
- $output =~ s/\%c/$month{$date[4]}/g;
+ if ($output =~ /\%c/) {
+ %month = _getMonth();
+ $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;
+ if ($output =~ /\%w/) {
+ %weekday = _getWeekday();
+ $output =~ s/\%w/$weekday{$date[6]}/g;
+ }
#---hour stuff
$hour12 = $date[2]+1;
if ($hour12 > 12) {
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index e88da3a09..2732e2e0b 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -11,6 +11,7 @@ package WebGUI::Form;
#-------------------------------------------------------------------
use strict qw(vars subs);
+use WebGUI::International;
use WebGUI::Session;
#-------------------------------------------------------------------
@@ -116,19 +117,22 @@ sub submit {
#-------------------------------------------------------------------
sub text {
- my ($output, $assistance, $name, $size, $maxLength, $value);
- ($name, $size, $maxLength, $value, $assistance) = @_;
+ my ($output, $assistance, $name, $size, $maxLength, $value, $events);
+ ($name, $size, $maxLength, $value, $assistance, $events) = @_;
if ($size eq "") {
$size = 15;
}
if ($maxLength ne "") {
$maxLength = ' maxlength="'.$maxLength.'"';
}
+ if ($events ne "") {
+ $events = ' '.$events;
+ }
if ($assistance == 1) {
- $assistance = '';
+ $assistance = '';
}
$value = _fixQuotes($value);
- $output = ''.$assistance;
+ $output = ''.$assistance;
return $output;
}
@@ -143,7 +147,8 @@ sub textArea {
$rows = 5;
}
if ($htmlEdit > 0) {
- $output = '
';
+ $output .= '';
+ $output .= '
';
}
if ($wrap eq "") {
$wrap = "virtual";
diff --git a/lib/WebGUI/Macro/T.pm b/lib/WebGUI/International.pm
similarity index 52%
rename from lib/WebGUI/Macro/T.pm
rename to lib/WebGUI/International.pm
index b38dc0c8f..d9dfd67fc 100644
--- a/lib/WebGUI/Macro/T.pm
+++ b/lib/WebGUI/International.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::T;
+package WebGUI::International;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,26 +11,28 @@ package WebGUI::Macro::T;
#-------------------------------------------------------------------
use strict;
-use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
+my %international;
+
#-------------------------------------------------------------------
-sub process {
- my ($output, $temp, @data, $sth);
- $output = $_[0];
- #---top menu vertical---
- if ($output =~ /\^T/) {
- $temp = '';
- $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=1 order by sequenceNumber",$session{dbh});
- while (@data = $sth->array) {
- if (WebGUI::Privilege::canViewPage($data[2])) {
- $temp .= ''.$data[0].'
';
- }
+sub get {
+ my ($output, $language);
+ if ($session{user}{language} ne "") {
+ $language = $session{user}{language};
+ } elsif ($_[1] ne "") {
+ $language = $_[1];
+ } else {
+ $language = "English";
+ }
+ if (defined $international{$language}{$_[0]}) { # a little caching never hurts =)
+ $output = $international{$language}{$_[0]};
+ } else {
+ ($output) = WebGUI::SQL->quickArray("select message from international where internationalId=$_[0] and language='$language'",$session{dbh});
+ if ($output eq "" && $language ne "English") {
+ $output = get($_[0],"English");
}
- $sth->finish;
- $temp .= '';
- $output =~ s/\^T/$temp/g;
}
return $output;
}
diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm
index 1fa54bbcc..871dff68f 100644
--- a/lib/WebGUI/Macro.pm
+++ b/lib/WebGUI/Macro.pm
@@ -16,9 +16,14 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
- my (@files, $file, $cmd, $output);
+ my (@files, $file, $cmd, $output, $macroDir);
$output = $_[0];
- opendir (DIR,$session{config}{webguiRoot}."/lib/WebGUI/Macro") or WebGUI::ErrorHandler::fatalError("Can't open macro directory!");
+ if ($^O =~ /Win/i) {
+ $macroDir = "\\lib\\WebGUI\\Macro";
+ } else {
+ $macroDir = "/lib/WebGUI/Macro";
+ }
+ opendir (DIR,$session{config}{webguiRoot}.$macroDir) or WebGUI::ErrorHandler::fatalError("Can't open macro directory!");
@files = readdir(DIR);
foreach $file (@files) {
if ($file ne "." && $file ne ".." && $file =~ /\.pm/) {
diff --git a/lib/WebGUI/Macro/P.pm b/lib/WebGUI/Macro/A_anyMenu.pm
similarity index 51%
rename from lib/WebGUI/Macro/P.pm
rename to lib/WebGUI/Macro/A_anyMenu.pm
index 11351223f..6e202175d 100644
--- a/lib/WebGUI/Macro/P.pm
+++ b/lib/WebGUI/Macro/A_anyMenu.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::P;
+package WebGUI::Macro::A_anyMenu;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,26 +11,29 @@ package WebGUI::Macro::P;
#-------------------------------------------------------------------
use strict;
+use WebGUI::Macro::Shared;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub process {
- my ($output, $temp, @data, $sth);
+ my ($output, $temp, $pageTitle, $depth, @data);
$output = $_[0];
- #---previous menu vertical---
- if ($output =~ /\^P/) {
- $temp = '';
- $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{parentId} order by sequenceNumber",$session{dbh});
- while (@data = $sth->array) {
- if (WebGUI::Privilege::canViewPage($data[2])) {
- $temp .= ''.$data[0].'
';
- }
- }
- $sth->finish;
+ #---any page sub menu vertical---
+ if ($output =~ /\^A(.*)\^\/A/) {
+ ($pageTitle,$depth) = split(/,/,$1);
+ if ($depth eq "") {
+ $depth = 1;
+ }
+ @data = WebGUI::SQL->quickArray("select pageId,title,urlizedTitle from page where urlizedTitle='$pageTitle'",$session{dbh});
+ $temp = $pageTitle.'|'.$depth.'';
+ if (defined $data[0] && WebGUI::Privilege::canViewPage($data[0])) {
+ $temp .= ''.$data[1].'
';
+ $temp .= traversePageTree($data[0],1,$depth);
+ }
$temp .= '';
- $output =~ s/\^P/$temp/g;
+ $output =~ s/\^A(.*)\^\/A/$temp/g;
}
return $output;
}
diff --git a/lib/WebGUI/Macro/At.pm b/lib/WebGUI/Macro/At_username.pm
similarity index 95%
rename from lib/WebGUI/Macro/At.pm
rename to lib/WebGUI/Macro/At_username.pm
index 1698dbd07..c58564a49 100644
--- a/lib/WebGUI/Macro/At.pm
+++ b/lib/WebGUI/Macro/At_username.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::At;
+package WebGUI::Macro::At_username;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/Backslash.pm b/lib/WebGUI/Macro/Backslash_pageUrl.pm
similarity index 95%
rename from lib/WebGUI/Macro/Backslash.pm
rename to lib/WebGUI/Macro/Backslash_pageUrl.pm
index e4b4d8f6a..49f03ee32 100644
--- a/lib/WebGUI/Macro/Backslash.pm
+++ b/lib/WebGUI/Macro/Backslash_pageUrl.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::Backslash;
+package WebGUI::Macro::Backslash_pageUrl;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/C.pm b/lib/WebGUI/Macro/C_crumbTrail.pm
similarity index 97%
rename from lib/WebGUI/Macro/C.pm
rename to lib/WebGUI/Macro/C_crumbTrail.pm
index f02c1d11b..0bfbd323e 100644
--- a/lib/WebGUI/Macro/C.pm
+++ b/lib/WebGUI/Macro/C_crumbTrail.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::C;
+package WebGUI::Macro::C_crumbTrail;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/Carat.pm b/lib/WebGUI/Macro/Carat_carat.pm
similarity index 95%
rename from lib/WebGUI/Macro/Carat.pm
rename to lib/WebGUI/Macro/Carat_carat.pm
index 6c22f6bfc..411269e0a 100644
--- a/lib/WebGUI/Macro/Carat.pm
+++ b/lib/WebGUI/Macro/Carat_carat.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::Carat;
+package WebGUI::Macro::Carat_carat;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/D.pm b/lib/WebGUI/Macro/D_date.pm
similarity index 96%
rename from lib/WebGUI/Macro/D.pm
rename to lib/WebGUI/Macro/D_date.pm
index 3a78a48d6..8cf0d55bb 100644
--- a/lib/WebGUI/Macro/D.pm
+++ b/lib/WebGUI/Macro/D_date.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::D;
+package WebGUI::Macro::D_date;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/H.pm b/lib/WebGUI/Macro/H_homeLink.pm
similarity index 91%
rename from lib/WebGUI/Macro/H.pm
rename to lib/WebGUI/Macro/H_homeLink.pm
index 24c6e87f8..bd20696fc 100644
--- a/lib/WebGUI/Macro/H.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::H;
+package WebGUI::Macro::H_homeLink;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,6 +11,7 @@ package WebGUI::Macro::H;
#-------------------------------------------------------------------
use strict;
+use WebGUI::International;
use WebGUI::Session;
#-------------------------------------------------------------------
@@ -22,7 +23,7 @@ sub process {
$temp = ''.$1.'';
$output =~ s/\^H(.*)\^\/H/$temp/g;
} elsif ($output =~ /\^H/) {
- $temp = 'Home';
+ $temp = ''.WebGUI::International::get(47).'';
$output =~ s/\^H/$temp/g;
}
return $output;
diff --git a/lib/WebGUI/Macro/Hash.pm b/lib/WebGUI/Macro/Hash_userId.pm
similarity index 95%
rename from lib/WebGUI/Macro/Hash.pm
rename to lib/WebGUI/Macro/Hash_userId.pm
index d45298595..7f949677d 100644
--- a/lib/WebGUI/Macro/Hash.pm
+++ b/lib/WebGUI/Macro/Hash_userId.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::Hash;
+package WebGUI::Macro::Hash_userId;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/L.pm b/lib/WebGUI/Macro/L_loginBox.pm
similarity index 69%
rename from lib/WebGUI/Macro/L.pm
rename to lib/WebGUI/Macro/L_loginBox.pm
index 7a58ce556..2f81ab6a2 100644
--- a/lib/WebGUI/Macro/L.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::L;
+package WebGUI::Macro::L_loginBox;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -12,6 +12,8 @@ package WebGUI::Macro::L;
use strict;
use WebGUI::Form;
+use WebGUI::International;
+use WebGUI::Macro::Backslash_pageUrl;
use WebGUI::Session;
#-------------------------------------------------------------------
@@ -22,13 +24,20 @@ sub process {
if ($output =~ /\^L/) {
$temp = '';
if ($session{var}{sessionId}) {
- $temp .= 'Hello '.$session{user}{username}.'. Click here to log out.';
+ $temp .= WebGUI::International::get(48);
+ $temp .= ' '.$session{user}{username}.'. ';
+ $temp .= WebGUI::International::get(49);
+ $temp = WebGUI::Macro::Backslash::process($temp);
} else {
$temp .= '';
}
$temp .= '';
diff --git a/lib/WebGUI/Macro/j.pm b/lib/WebGUI/Macro/M_currentMenuVertical.pm
similarity index 68%
rename from lib/WebGUI/Macro/j.pm
rename to lib/WebGUI/Macro/M_currentMenuVertical.pm
index fb18e8bfd..2b457929f 100644
--- a/lib/WebGUI/Macro/j.pm
+++ b/lib/WebGUI/Macro/M_currentMenuVertical.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::j;
+package WebGUI::Macro::M_currentMenuVertical;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -18,12 +18,17 @@ use WebGUI::Session;
sub process {
my ($output, $temp);
$output = $_[0];
- #---2 level current level menu (vertical)---
- if ($output =~ /\^j/) {
+ #---current menu vertical---
+ if ($output =~ /\^M(.*)\^\/M/) {
$temp = '';
- $temp .= traversePageTree($session{page}{pageId},0,2);
+ $temp .= traversePageTree($session{page}{pageId},0,$1);
$temp .= '';
- $output =~ s/\^j/$temp/g;
+ $output =~ s/\^M(.*)\^\/M/$temp/g;
+ } elsif ($output =~ /\^M/) {
+ $temp = '';
+ $temp .= traversePageTree($session{page}{pageId},0,1);
+ $temp .= '';
+ $output =~ s/\^M/$temp/g;
}
return $output;
}
diff --git a/lib/WebGUI/Macro/F.pm b/lib/WebGUI/Macro/P_previousMenuVertical.pm
similarity index 59%
rename from lib/WebGUI/Macro/F.pm
rename to lib/WebGUI/Macro/P_previousMenuVertical.pm
index 979734944..56afe9b56 100644
--- a/lib/WebGUI/Macro/F.pm
+++ b/lib/WebGUI/Macro/P_previousMenuVertical.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::F;
+package WebGUI::Macro::P_previousMenuVertical;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -12,17 +12,23 @@ package WebGUI::Macro::F;
use strict;
use WebGUI::Macro::Shared;
+use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
- #---2 level menu (vertical)---
- if ($output =~ /\^F/) {
+ #---previous menu vertical---
+ if ($output =~ /\^P(.*)\^\/P/) {
$temp = '';
- $temp .= traversePageTree(1,0,2);
- $temp .= '';
- $output =~ s/\^F/$temp/g;
+ $temp .= traversePageTree($session{page}{parentId},0,$1);
+ $temp .= '';
+ $output =~ s/\^P(.*)\^\/P/$temp/g;
+ } elsif ($output =~ /\^P/) {
+ $temp = '';
+ $temp .= traversePageTree($session{page}{parentId},0,1);
+ $temp .= '';
+ $output =~ s/\^P/$temp/g;
}
return $output;
}
diff --git a/lib/WebGUI/Macro/Splat.pm b/lib/WebGUI/Macro/Splat_random.pm
similarity index 73%
rename from lib/WebGUI/Macro/Splat.pm
rename to lib/WebGUI/Macro/Splat_random.pm
index 176f11b2c..0236392e3 100644
--- a/lib/WebGUI/Macro/Splat.pm
+++ b/lib/WebGUI/Macro/Splat_random.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::Splat;
+package WebGUI::Macro::Splat_random;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,14 +11,18 @@ package WebGUI::Macro::Splat;
#-------------------------------------------------------------------
use strict;
+use WebGUI::Utility;
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
#---random number---
- if ($output =~ /\^\*/) {
- $temp = rand()*1000000000;
+ if ($output =~ /\^\*(.*)\^\/\*/) {
+ $temp = round(rand()*$1);
+ $output =~ s/\^\*(.*)\^\/\*/$temp/g;
+ } elsif ($output =~ /\^\*/) {
+ $temp = round(rand()*1000000000);
$output =~ s/\^\*/$temp/g;
}
return $output;
diff --git a/lib/WebGUI/Macro/J.pm b/lib/WebGUI/Macro/T_topMenuVertical.pm
similarity index 64%
rename from lib/WebGUI/Macro/J.pm
rename to lib/WebGUI/Macro/T_topMenuVertical.pm
index 17d428382..dff2f9f8d 100644
--- a/lib/WebGUI/Macro/J.pm
+++ b/lib/WebGUI/Macro/T_topMenuVertical.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::J;
+package WebGUI::Macro::T_topMenuVertical;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -12,18 +12,22 @@ package WebGUI::Macro::J;
use strict;
use WebGUI::Macro::Shared;
-use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
- my ($output, $temp, @data, $sth, $first);
+ my ($output, $temp);
$output = $_[0];
- #---3 level current level menu (vertical)---
- if ($output =~ /\^J/) {
+ #---top menu vertical---
+ if ($output =~ /\^T(.*)\^\/T/) {
$temp = '';
- $temp .= traversePageTree($session{page}{pageId},0,3);
+ $temp .= traversePageTree(1,0,$1);
$temp .= '';
- $output =~ s/\^J/$temp/g;
+ $output =~ s/\^T(.*)\^\/T/$temp/g;
+ } elsif ($output =~ /\^T/) {
+ $temp = '';
+ $temp .= traversePageTree(1,0,1);
+ $temp .= '';
+ $output =~ s/\^T/$temp/g;
}
return $output;
}
diff --git a/lib/WebGUI/Macro/a.pm b/lib/WebGUI/Macro/a_account.pm
similarity index 90%
rename from lib/WebGUI/Macro/a.pm
rename to lib/WebGUI/Macro/a_account.pm
index 4b74bc90e..469056168 100644
--- a/lib/WebGUI/Macro/a.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::a;
+package WebGUI::Macro::a_account;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,6 +11,7 @@ package WebGUI::Macro::a;
#-------------------------------------------------------------------
use strict;
+use WebGUI::International;
use WebGUI::Session;
#-------------------------------------------------------------------
@@ -22,7 +23,7 @@ sub process {
$temp = ''.$1.'';
$output =~ s/\^a(.*)\^\/a/$temp/g;
} elsif ($output =~ /\^a/) {
- $temp = 'My Account';
+ $temp = ''.WebGUI::International::get(46).'';
$output =~ s/\^a/$temp/g;
}
return $output;
diff --git a/lib/WebGUI/Macro/c.pm b/lib/WebGUI/Macro/c_companyName.pm
similarity index 95%
rename from lib/WebGUI/Macro/c.pm
rename to lib/WebGUI/Macro/c_companyName.pm
index 7c53d5a62..3c0aa05fd 100644
--- a/lib/WebGUI/Macro/c.pm
+++ b/lib/WebGUI/Macro/c_companyName.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::c;
+package WebGUI::Macro::c_companyName;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/e.pm b/lib/WebGUI/Macro/e_companyEmail.pm
similarity index 95%
rename from lib/WebGUI/Macro/e.pm
rename to lib/WebGUI/Macro/e_companyEmail.pm
index 841fcbad4..af295d08f 100644
--- a/lib/WebGUI/Macro/e.pm
+++ b/lib/WebGUI/Macro/e_companyEmail.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::e;
+package WebGUI::Macro::e_companyEmail;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/f.pm b/lib/WebGUI/Macro/f.pm
deleted file mode 100644
index ff4862bef..000000000
--- a/lib/WebGUI/Macro/f.pm
+++ /dev/null
@@ -1,31 +0,0 @@
-package WebGUI::Macro::f;
-
-#-------------------------------------------------------------------
-# 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 strict;
-use WebGUI::Macro::Shared;
-
-#-------------------------------------------------------------------
-sub process {
- my ($output, $temp);
- $output = $_[0];
- #---full menu (vertical)---
- if ($output =~ /\^f/) {
- $temp = '';
- $temp .= traversePageTree(1,0);
- $temp .= '';
- $output =~ s/\^f/$temp/g;
- }
- return $output;
-}
-
-1;
-
diff --git a/lib/WebGUI/Macro/h.pm b/lib/WebGUI/Macro/h.pm
deleted file mode 100644
index 399467576..000000000
--- a/lib/WebGUI/Macro/h.pm
+++ /dev/null
@@ -1,31 +0,0 @@
-package WebGUI::Macro::h;
-
-#-------------------------------------------------------------------
-# 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 strict;
-use WebGUI::Macro::Shared;
-
-#-------------------------------------------------------------------
-sub process {
- my ($output, $temp);
- $output = $_[0];
- #---3 level menu (vertical)---
- if ($output =~ /\^h/) {
- $temp = '';
- $temp .= traversePageTree(1,0,3);
- $temp .= '';
- $output =~ s/\^h/$temp/g;
- }
- return $output;
-}
-
-1;
-
diff --git a/lib/WebGUI/Macro/m.pm b/lib/WebGUI/Macro/m.pm
deleted file mode 100644
index 2dde95842..000000000
--- a/lib/WebGUI/Macro/m.pm
+++ /dev/null
@@ -1,39 +0,0 @@
-package WebGUI::Macro::m;
-
-#-------------------------------------------------------------------
-# 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 strict;
-use WebGUI::Privilege;
-use WebGUI::Session;
-use WebGUI::SQL;
-
-#-------------------------------------------------------------------
-sub process {
- my ($output, $temp, @data, $sth, $first);
- $output = $_[0];
- #---current menu vertical---
- if ($output =~ /\^M/) {
- $temp = '';
- $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{pageId} order by sequenceNumber",$session{dbh});
- while (@data = $sth->array) {
- if (WebGUI::Privilege::canViewPage($data[2])) {
- $temp .= ''.$data[0].'
';
- }
- }
- $sth->finish;
- $temp .= '';
- $output =~ s/\^M/$temp/g;
- }
- return $output;
-}
-
-1;
-
diff --git a/lib/WebGUI/Macro/M.pm b/lib/WebGUI/Macro/m_currentMenuHorizontal.pm
similarity index 96%
rename from lib/WebGUI/Macro/M.pm
rename to lib/WebGUI/Macro/m_currentMenuHorizontal.pm
index 7978335e9..af6e53eba 100644
--- a/lib/WebGUI/Macro/M.pm
+++ b/lib/WebGUI/Macro/m_currentMenuHorizontal.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::M;
+package WebGUI::Macro::m_currentMenuHorizontal;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/p.pm b/lib/WebGUI/Macro/p_previousMenuHorizontal.pm
similarity index 97%
rename from lib/WebGUI/Macro/p.pm
rename to lib/WebGUI/Macro/p_previousMenuHorizontal.pm
index 0d199362e..7d9dc73a4 100644
--- a/lib/WebGUI/Macro/p.pm
+++ b/lib/WebGUI/Macro/p_previousMenuHorizontal.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::p;
+package WebGUI::Macro::p_previousMenuHorizontal;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/r.pm b/lib/WebGUI/Macro/r_printable.pm
similarity index 89%
rename from lib/WebGUI/Macro/r.pm
rename to lib/WebGUI/Macro/r_printable.pm
index eee8b86f1..bb506ef2b 100644
--- a/lib/WebGUI/Macro/r.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::r;
+package WebGUI::Macro::r_printable;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
@@ -11,6 +11,7 @@ package WebGUI::Macro::r;
#-------------------------------------------------------------------
use strict;
+use WebGUI::International;
use WebGUI::Session;
#-------------------------------------------------------------------
@@ -34,7 +35,9 @@ sub process {
} else {
$temp .= '?makePrintable=1';
}
- $temp = 'Make Page Printable';
+ $temp = '';
+ $temp .= WebGUI::International::get(53);
+ $temp .= '';
$output =~ s/\^r/$temp/g;
}
return $output;
diff --git a/lib/WebGUI/Macro/t.pm b/lib/WebGUI/Macro/t_topMenuHorizontal.pm
similarity index 96%
rename from lib/WebGUI/Macro/t.pm
rename to lib/WebGUI/Macro/t_topMenuHorizontal.pm
index 65393f5da..6de6a7270 100644
--- a/lib/WebGUI/Macro/t.pm
+++ b/lib/WebGUI/Macro/t_topMenuHorizontal.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::t;
+package WebGUI::Macro::t_topMenuHorizontal;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Macro/u.pm b/lib/WebGUI/Macro/u_companyUrl.pm
similarity index 95%
rename from lib/WebGUI/Macro/u.pm
rename to lib/WebGUI/Macro/u_companyUrl.pm
index 08ee88263..2796fb76d 100644
--- a/lib/WebGUI/Macro/u.pm
+++ b/lib/WebGUI/Macro/u_companyUrl.pm
@@ -1,4 +1,4 @@
-package WebGUI::Macro::u;
+package WebGUI::Macro::u_companyUrl;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001 Plain Black Software.
diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm
index 2b577556a..cf2228a98 100644
--- a/lib/WebGUI/Operation/Account.pm
+++ b/lib/WebGUI/Operation/Account.pm
@@ -15,8 +15,10 @@ use Exporter;
use Net::LDAP;
use strict;
use URI;
+use WebGUI::DateTime;
use WebGUI::ErrorHandler;
use WebGUI::Form;
+use WebGUI::International;
use WebGUI::Mail;
use WebGUI::Privilege;
use WebGUI::Session;
@@ -56,40 +58,43 @@ sub _login {
WebGUI::Session::setCookie("wgSession",$cookieInfo);
return "";
} else {
+ WebGUI::ErrorHandler::warn("Session signature '".$cookieInfo."' does not match account info for user ID ".$_[0]);
return "Error: Unable to initialize session vars because your session signature does not match your account information.";
}
}
#-------------------------------------------------------------------
sub www_createAccount {
- my ($output);
+ my ($output, %language);
if ($session{user}{userId} != 1) {
$output .= www_displayAccount();
} elsif ($session{setting}{anonymousRegistration} eq "no") {
$output .= www_displayLogin();
} else {
- $output .= '
Create Account
';
$output .= '';
- $output .= '- I already have an account.';
+ $output .= '
- '.WebGUI::International::get(58).'';
if ($session{setting}{authMethod} eq "WebGUI") {
- $output .= '
- I forgot my password.';
+ $output .= '
- '.WebGUI::International::get(59).'';
}
$output .= '
';
}
@@ -102,10 +107,10 @@ sub www_deactivateAccount {
if ($session{user}{userId} == 1) {
$output .= www_displayLogin();
} else {
- $output .= 'Please Confirm
';
- $output .= 'Are you certain you want to deactivate your account. If you proceed your account information will be lost permanently.';
- $output .= '
Yes, I\'m sure.';
- $output .= ' No, I made a mistake.';
+ $output .= ''.WebGUI::International::get(42).'
';
+ $output .= WebGUI::International::get(60).'';
+ $output .= '
'.WebGUI::International::get(44).'';
+ $output .= ' '.WebGUI::International::get(45).'';
}
return $output;
}
@@ -123,34 +128,37 @@ sub www_deactivateAccountConfirm {
#-------------------------------------------------------------------
sub www_displayAccount {
- my ($output);
+ my ($output, %hash, @array);
if ($session{user}{userId} != 1) {
- $output .= ' Update Account Information
';
$output .= '';
if (WebGUI::Privilege::isInGroup(3) || WebGUI::Privilege::isInGroup(4)) {
if ($session{var}{adminOn}) {
- $output .= '- Turn admin off.';
+ $output .= '
- '.WebGUI::International::get(12).'';
} else {
- $output .= '
- Turn admin on.';
+ $output .= '
- '.WebGUI::International::get(63).'';
}
}
- $output .= '
- Logout.
- Please deactivate my account permanently.
';
+ $output .= ''.WebGUI::International::get(64).'';
+ $output .= ' '.WebGUI::International::get(65).'';
} else {
- $output .= 'You need to be logged in to view your account information.';
$output .= www_displayLogin();
}
return $output;
@@ -162,20 +170,21 @@ sub www_displayLogin {
if ($session{var}{sessionId}) {
$output .= www_displayAccount();
} else {
- $output .= '
Login
';
$output .= '';
if ($session{setting}{anonymousRegistration} eq "yes") {
- $output .= '- Create a new account.';
+ $output .= '
- '.WebGUI::International::get(67).'';
}
if ($session{setting}{authMethod} eq "WebGUI") {
- $output .= '
- I forgot my password.';
+ $output .= '
- '.WebGUI::International::get(59).'';
}
$output .= '
';
}
@@ -194,14 +203,15 @@ sub www_login {
$port = $uri->port;
}
%args = (port => $port);
- $ldap = Net::LDAP->new($uri->host, %args) or $error = "Cannot connect to LDAP server.";
+ $ldap = Net::LDAP->new($uri->host, %args) or $error = WebGUI::International::get(79);
$auth = $ldap->bind($connectDN, $session{form}{identifier});
$ldap->unbind;
if ($auth->code == 48 || $auth->code == 49) {
- $error = "The account information you supplied is invalid. Either the account does not exist or the username/password combination was incorrect.";
+ $error = WebGUI::International::get(68);
WebGUI::ErrorHandler::warn("Invalid login for user account: ".$session{form}{username});
} elsif ($auth->code > 0) {
- $error .= 'LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. Please contact your system administrator for assistance. ';
+ $error .= 'LDAP error "'.$ldapStatusCode{$auth->code}.'" occured.';
+ $error .= WebGUI::International::get(69);
WebGUI::ErrorHandler::warn("LDAP error: ".$ldapStatusCode{$auth->code});
} else {
$success = 1;
@@ -210,7 +220,7 @@ sub www_login {
if (Digest::MD5::md5_base64($session{form}{identifier}) eq $pass && $session{form}{identifier} ne "") {
$success = 1;
} else {
- $error = "The account information you supplied is invalid. Either the account does not exist or the username/password combination was incorrect.";
+ $error = WebGUI::International::get(68);
WebGUI::ErrorHandler::warn("Invalid login for user account: ".$session{form}{username});
}
}
@@ -218,7 +228,7 @@ sub www_login {
_login($uid,$pass);
return "";
} else {
- return "Error
".$error.www_displayLogin();
+ return "".WebGUI::International::get(70)."
".$error.www_displayLogin();
}
}
@@ -235,18 +245,19 @@ sub www_recoverPassword {
if ($session{var}{sessionId}) {
$output .= www_displayAccount();
} else {
- $output .= ' Recover Password
';
$output .= '';
if ($session{setting}{anonymousRegistration} eq "yes") {
- $output .= '- Create a new account.';
+ $output .= '
- '.WebGUI::International::get(67).'';
}
- $output .= '
- Login.';
+ $output .= '
- '.WebGUI::International::get(73).'';
$output .= '
';
}
return $output;
@@ -263,15 +274,17 @@ sub www_recoverPasswordFinish {
$encryptedPassword = Digest::MD5::md5_base64($password);
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 represents your new account information:\nUser: ".$username."\nPass: ".$password."\n";
- WebGUI::Mail::send($session{form}{email},"Account Information",$message);
+ $message = $session{setting}{recoverPasswordEmail};
+ $message .= "\n".WebGUI::International::get(50).": ".$username."\n";
+ $message .= WebGUI::International::get(51).": ".$password."\n";
+ WebGUI::Mail::send($session{form}{email},WebGUI::International::get(74),$message);
}
$sth->finish();
if ($flag) {
- $output = '- Your account information has been sent to your email address.
';
+ $output = '- '.WebGUI::International::get(75).'
';
$output .= www_displayLogin();
} else {
- $output = '- That email address is not in our databases.
';
+ $output = '- '.WebGUI::International::get(76).'
';
$output .= www_recoverPassword();
}
return $output;
@@ -281,10 +294,14 @@ sub www_recoverPasswordFinish {
sub www_saveAccount {
my ($uri, $ldap, $port, %args, $search, $connectDN, $auth, $output, $error, $uid, $encryptedPassword);
if (_hasBadUsername($session{form}{username})) {
- $error = 'The account name "'.$session{form}{username}.'" is in use by another member of this site. Please try a different username, perhaps "'.$session{form}{username}.'too" or "'.$session{form}{username}.'01" ';
+ $error = WebGUI::International::get(77);
+ $error .= ' "'.$session{form}{username}.'too", ';
+ $error .= '"'.$session{form}{username}.'2", ';
+ $error .= '"'.$session{form}{username}.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"';
+ $error .= '';
}
if (_hasBadPassword($session{form}{identifier1},$session{form}{identifier2})) {
- $error .= 'Your passwords did not match. Please try again. ';
+ $error .= WebGUI::International::get(78);
}
if ($session{setting}{authMethod} eq "LDAP") {
$uri = URI->new($session{setting}{ldapURL});
@@ -294,18 +311,18 @@ sub www_saveAccount {
$port = $uri->port;
}
%args = (port => $port);
- $ldap = Net::LDAP->new($uri->host, %args) or $error .= "Cannot connect to LDAP server. ";
+ $ldap = Net::LDAP->new($uri->host, %args) or $error .= WebGUI::International::get(79);
$ldap->bind;
$search = $ldap->search (base => $uri->dn, filter => $session{setting}{ldapId}."=".$session{form}{ldapId});
$connectDN = "cn=".$search->entry(0)->get_value("cn");
$ldap->unbind;
- $ldap = Net::LDAP->new($uri->host, %args) or $error .= "Cannot connect to LDAP server. ";
+ $ldap = Net::LDAP->new($uri->host, %args) or $error .= WebGUI::International::get(79);
$auth = $ldap->bind(dn=>$connectDN, password=>$session{form}{ldapPassword});
if ($auth->code == 48 || $auth->code == 49) {
- $error .= "Either your ".$session{setting}{ldapIdName}." or ".$session{setting}{ldapPasswordName}." were invalid. ";
+ $error .= WebGUI::International::get(68);
WebGUI::ErrorHandler::warn("Invalid LDAP information for registration of LDAP ID: ".$session{form}{ldapId});
} elsif ($auth->code > 0) {
- $error .= 'LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. Please contact your system administrator for assistance. ';
+ $error .= 'LDAP error "'.$ldapStatusCode{$auth->code}.'" occured. '.WebGUI::International::get(69);
WebGUI::ErrorHandler::warn("LDAP error: ".$ldapStatusCode{$auth->code});
}
$ldap->unbind;
@@ -313,13 +330,13 @@ sub www_saveAccount {
if ($error eq "") {
$encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1});
$uid = getNextId("userId");
- 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 users (userId,username,identifier,email,authMethod,ldapURL,connectDN,language) values ($uid, ".quote($session{form}{username}).", ".quote($encryptedPassword).", ".quote($session{form}{email}).", ".quote($session{setting}{authMethod}).", ".quote($session{setting}{ldapURL}).", ".quote($connectDN).", ".quote($session{form}{language}).")",$session{dbh});
WebGUI::SQL->write("insert into groupings values (2,$uid)",$session{dbh});
_login($uid,$encryptedPassword);
- $output .= 'Account created successfully!
';
+ $output .= WebGUI::International::get(80).'
';
$output .= www_displayAccount();
} else {
- $output = "
Error
".$error.www_createAccount();
+ $output = "".WebGUI::International::get(70)."
".$error.www_createAccount();
}
return $output;
}
@@ -329,21 +346,25 @@ sub www_updateAccount {
my ($output, $error, $encryptedPassword, $passwordStatement);
if ($session{var}{sessionId}) {
if (_hasBadUsername($session{form}{username})) {
- $error = 'Error: The account name '.$session{form}{username}.' is in use by another member of this site. Please try a different username, perhaps "'.$session{form}{username}.'too" or "'.$session{form}{username}.'01"';
+ $error = WebGUI::International::get(77);
+ $error .= ' "'.$session{form}{username}.'too", ';
+ $error .= '"'.$session{form}{username}.'2", ';
+ $error .= '"'.$session{form}{username}.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"';
+ $error .= '
';
}
if ($session{form}{identifier1} ne "password" && _hasBadPassword($session{form}{identifier1},$session{form}{identifier2})) {
- $error .= 'Error: Your passwords did not match. Please try again.
';
+ $error .= WebGUI::International::get(78).'
';
} else {
$encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1});
$passwordStatement = ', identifier='.quote($encryptedPassword);
}
if ($error eq "") {
$encryptedPassword = Digest::MD5::md5_base64($session{form}{identifier1});
- 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});
+ WebGUI::SQL->write("update users set username=".quote($session{form}{username}).$passwordStatement.", email=".quote($session{form}{email}).", language=".quote($session{form}{language})." where userId=".$session{user}{userId},$session{dbh});
if ($passwordStatement ne "") {
_login($session{user}{userId},$encryptedPassword);
}
- $output .= 'Account updated successfully!
';
+ $output .= WebGUI::International::get(81).'
';
$output .= www_displayAccount();
} else {
$output = $error;
@@ -356,3 +377,4 @@ sub www_updateAccount {
}
1;
+
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 61cc65a30..864abcdac 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -14,6 +14,7 @@ use Exporter;
use strict;
use Tie::CPHash;
use WebGUI::Form;
+use WebGUI::International;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
@@ -26,12 +27,14 @@ our @EXPORT = qw(&www_addGroup &www_addGroupSave &www_deleteGroup &www_deleteGro
sub www_addGroup {
my ($output);
if (WebGUI::Privilege::isInGroup(3)) {
- $output .= '
Add Group
';
} else {
@@ -58,10 +61,11 @@ sub www_deleteGroup {
if ($session{form}{gid} < 26) {
return WebGUI::Privilege::vitalComponent();
} elsif (WebGUI::Privilege::isInGroup(3)) {
- $output .= '
Please Confirm
';
- $output .= 'Are you certain you wish to delete this group? Beware that deleting a group is permanent and will remove all privileges associated with this group.';
- $output .= '
Yes, I\'m sure.';
- $output .= ' No, I made a mistake. ';
+ $output .= '
';
+ $output .= ''.WebGUI::International::get(42).'
';
+ $output .= WebGUI::International::get(86).'';
+ $output .= '
'.WebGUI::International::get(44).'';
+ $output .= ' '.WebGUI::International::get(45).'';
return $output;
} else {
return WebGUI::Privilege::adminOnly();
@@ -87,14 +91,16 @@ sub www_editGroup {
tie %group, 'Tie::CPHash';
if (WebGUI::Privilege::isInGroup(3)) {
%group = WebGUI::SQL->quickHash("select * from groups where groupId=$session{form}{gid}",$session{dbh});
- $output .= '
Edit Group