diff --git a/docs/create.sql b/docs/create.sql index 8783892e6..8ffd62df6 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -2366,6 +2366,15 @@ INSERT INTO international VALUES (375,'WebGUI','English','Select Package To Depl INSERT INTO international VALUES (376,'WebGUI','English','Package'); INSERT INTO international VALUES (377,'WebGUI','English','No packages have been defined by your package manager(s) or administrator(s).'); INSERT INTO international VALUES (11,'Poll','English','Vote!'); +INSERT INTO international VALUES (31,'UserSubmission','English','Content'); +INSERT INTO international VALUES (32,'UserSubmission','English','Image'); +INSERT INTO international VALUES (33,'UserSubmission','English','Attachement'); +INSERT INTO international VALUES (34,'UserSubmission','English','Convert Carriage Returns'); +INSERT INTO international VALUES (35,'UserSubmission','English','Title'); +INSERT INTO international VALUES (36,'UserSubmission','English','Delete file.'); +INSERT INTO international VALUES (378,'WebGUI','English','User ID'); +INSERT INTO international VALUES (379,'WebGUI','English','Group ID'); +INSERT INTO international VALUES (380,'WebGUI','English','Style ID'); # # Table structure for table 'messageLog' @@ -2414,7 +2423,7 @@ CREATE TABLE page ( # Dumping data for table 'page' # -INSERT INTO page VALUES (1,0,'Home',-5,3,1,1,1,1,0,1,0,1,'','home',1,'Default'); +INSERT INTO page VALUES (1,0,'Home',-3,3,1,1,1,1,0,1,0,1,'','home',1,'Default'); INSERT INTO page VALUES (6,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); INSERT INTO page VALUES (7,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); INSERT INTO page VALUES (8,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); @@ -2435,7 +2444,7 @@ INSERT INTO page VALUES (22,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Def INSERT INTO page VALUES (23,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); INSERT INTO page VALUES (24,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); INSERT INTO page VALUES (25,0,'Reserved',0,0,1,1,NULL,1,0,1,0,1,NULL,NULL,0,'Default'); -INSERT INTO page VALUES (4,0,'Page Not Found',-2,3,1,1,1,1,0,1,0,1,'','page_not_found',0,'Default'); +INSERT INTO page VALUES (4,0,'Page Not Found',-3,3,1,1,1,1,0,1,0,1,'','page_not_found',0,'Default'); INSERT INTO page VALUES (3,0,'Trash',4,3,1,1,3,1,1,0,0,1,'','trash',0,'Default'); INSERT INTO page VALUES (2,0,'Clipboard',4,3,1,1,4,1,1,0,0,1,'','clipboard',0,'Default'); INSERT INTO page VALUES (5,0,'Packages',1,3,0,0,6,1,1,0,0,1,'','packages',0,'Default'); @@ -2515,9 +2524,9 @@ CREATE TABLE style ( # INSERT INTO style VALUES (1,'Packages','\r\n
PACKAGES
^FlexMenu;		CONTENT
','
\r\n
\r\n^H; / ^a;\r\n',''); -INSERT INTO style VALUES (-3,'WebGUI','\r\n\r\n\r\n\r\n
\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n
^FlexMenu;
\r\n^L;\r\n		\r\n\r\n','
\r\n

\r\n

\r\n
\r\n©2001-2002 Plain Black Software
\r\n
\r\n',''); +INSERT INTO style VALUES (-3,'WebGUI','\r\n\r\n\r\n\r\n
\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n
^FlexMenu;
\r\n^L;\r\n		\r\n\r\n','
\r\n

\r\n

\r\n
\r\n©2001-2002 Plain Black Software
\r\n
\r\n',''); INSERT INTO style VALUES (2,'Fail Safe','\r\n^H; / ^t; / ^m; / ^a;\r\n
','
\r\n^H; / ^t; / ^m; / ^a;\r\n',''); -INSERT INTO style VALUES (-2,'Plain Black Software (black)','\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n
\"Plain\"User:\" ^@;\"My\"|\"\"Download\"\"|\"\"Home\"
^C;^D(\"%c %D, %y\");
\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n\r\n
^T(2);','

\"\"

\r\n\r\n\r\n \r\n \r\n\r\n
\"Copyright^r(\'\"Make\');
\r\n\r\n',''); +INSERT INTO style VALUES (-2,'Plain Black Software (black)','\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n
\"Plain\"User:\" ^@;\"My\"|\"\"Download\"\"|\"\"Home\"
^C;^D(\"%c %D, %y\");
\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n\r\n
^T(2);','

\"\"

\r\n\r\n\r\n \r\n \r\n\r\n
\"Copyright^r(\'\"Make\');
\r\n\r\n',''); INSERT INTO style VALUES (4,'Trash / Clipboard','\r\n
PAGES
^M(0);		CONTENT
','
\r\n
\r\n^H; / ^a;\r\n',''); INSERT INTO style VALUES (5,'Reserved','','',NULL); INSERT INTO style VALUES (6,'Reserved','','',NULL); @@ -2543,7 +2552,7 @@ INSERT INTO style VALUES (-1,'Yahoo!','Yahoo!\r\n\r\n\r\n\r\n \r\n \r\n \r\n

Your Company Name Here

Address: 1903 Sunrise St. City, State 65977
\r\nTel: 915.888.8888
\r\nEmail: service@company.com
\r\n\r\n \r\n \r\n \r\n \r\n
^t;
\r\n\r\n \r\n \r\n \r\n \r\n
\r\n
\r\n^M;\r\n
\r\n
\r\n \r\n \r\n
\r\n ','
\r\n
\r\n\r\n\r\n
^H · ^a;
\r\n\r\n\r\n\r\n',''); INSERT INTO style VALUES (3,'Make Page Printable','\r\n
','
© 2001-2002 Plain Black Software
\r\n',''); INSERT INTO style VALUES (25,'Reserved',NULL,NULL,NULL); -INSERT INTO style VALUES (-5,'Plain Black Software (white)','\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n
\"Plain\"User:\" ^@;\"My\"|\"\"Download\"\"|\"\"Home\"
^C;^D(\"%c %D, %y\");
\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n\r\n
^T(2);','

\"\"

\r\n\r\n\r\n \r\n \r\n\r\n
\"Copyright^r(\'\"Make\');
\r\n\r\n',''); +INSERT INTO style VALUES (-5,'Plain Black Software (white)','\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n\r\n \r\n \r\n\r\n
\"Plain\"User:\" ^@;\"My\"|\"\"Download\"\"|\"\"Home\"
^C;^D(\"%c %D, %y\");
\r\n\r\n\r\n \r\n \r\n\r\n\r\n \r\n\r\n
^T(2);','

\"\"

\r\n\r\n\r\n \r\n \r\n\r\n
\"Copyright^r(\'\"Make\');
\r\n\r\n',''); # # Table structure for table 'users' @@ -2632,7 +2641,7 @@ CREATE TABLE widget ( addedBy int(11) default NULL, lastEdited int(11) default NULL, editedBy int(11) default NULL, - position char(1) NOT NULL default 'A', + templatePosition char(1) NOT NULL default 'A', PRIMARY KEY (widgetId) ) TYPE=MyISAM; diff --git a/docs/gotcha.txt b/docs/gotcha.txt index c208f6993..3dc27acfb 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,15 @@ upgrading from one version to the next, or even between multiple versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +3.0.1 +-------------------------------------------------------------------- + * The macro syntax of old has officially been removed. If you're + still using the old macro syntax, you must change them to + the new syntax to avoid problems. + + Example: ^r => ^r; + Example: ^m3^/m => ^m(3); + 3.0.0 -------------------------------------------------------------------- * All 3rd-party widgets, macros, and templates that were not diff --git a/docs/upgrades/upgrade_3.0.0-3.0.1.sql b/docs/upgrades/upgrade_3.0.0-3.0.1.sql new file mode 100644 index 000000000..77a5b1255 --- /dev/null +++ b/docs/upgrades/upgrade_3.0.0-3.0.1.sql @@ -0,0 +1,11 @@ +alter table widget change position templatePosition char(1) not null default 'A'; +INSERT INTO international VALUES (31,'UserSubmission','English','Content'); +INSERT INTO international VALUES (32,'UserSubmission','English','Image'); +INSERT INTO international VALUES (33,'UserSubmission','English','Attachement'); +INSERT INTO international VALUES (34,'UserSubmission','English','Convert Carriage Returns'); +INSERT INTO international VALUES (35,'UserSubmission','English','Title'); +INSERT INTO international VALUES (36,'UserSubmission','English','Delete file.'); +INSERT INTO international VALUES (378,'WebGUI','English','User ID'); +INSERT INTO international VALUES (379,'WebGUI','English','Group ID'); +INSERT INTO international VALUES (380,'WebGUI','English','Style ID'); + diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index 288da9eed..79ff472f7 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -1,5 +1,5 @@ package WebGUI; -our $VERSION = "3.0.0"; +our $VERSION = "3.0.1"; #------------------------------------------------------------------- # WebGUI is Copyright 2001-2002 Plain Black Software. @@ -172,7 +172,7 @@ sub page { if ($session{var}{adminOn}) { $pageEdit = '
Page Settings:Edit PageCut PageDelete PageMove Page UpMove Page Down'; } - $sth = WebGUI::SQL->read("select widgetId, widgetType, position from widget where pageId=".$session{page}{pageId}." order by sequenceNumber, widgetId"); + $sth = WebGUI::SQL->read("select widgetId, widgetType, templatePosition from widget where pageId=".$session{page}{pageId}." order by sequenceNumber, widgetId"); while (@widgetList = $sth->array) { if ($session{var}{adminOn}) { $contentHash{$widgetList[2]} .= '
EditCutCopyDeleteMove UpMove DownMove to TopMove to Bottom
'; diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm index ff70e02a6..d8623ccd0 100644 --- a/lib/WebGUI/Macro.pm +++ b/lib/WebGUI/Macro.pm @@ -47,12 +47,6 @@ sub process { } } closedir(DIR); - #---script url--- - # slash has to go last because it is also used as the end character for configurable widgets - # this will disappear in a future rev as it is depricated - if ($output =~ /\^\//) { - $output =~ s/\^\//$session{env}{SCRIPT_NAME}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/At_username.pm b/lib/WebGUI/Macro/At_username.pm index 17a6a79da..d473d185a 100644 --- a/lib/WebGUI/Macro/At_username.pm +++ b/lib/WebGUI/Macro/At_username.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^\@\;/$session{user}{username}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^\@/) { - $output =~ s/\^\@/$session{user}{username}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/Backslash_pageUrl.pm b/lib/WebGUI/Macro/Backslash_pageUrl.pm index 70794ddc2..3d39982a4 100644 --- a/lib/WebGUI/Macro/Backslash_pageUrl.pm +++ b/lib/WebGUI/Macro/Backslash_pageUrl.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^\\\;/$session{page}{url}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^\\/) { - $output =~ s/\^\\/$session{page}{url}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/C_crumbTrail.pm b/lib/WebGUI/Macro/C_crumbTrail.pm index e05446091..4d0ff5ff8 100644 --- a/lib/WebGUI/Macro/C_crumbTrail.pm +++ b/lib/WebGUI/Macro/C_crumbTrail.pm @@ -41,11 +41,6 @@ sub process { my ($output, $temp); $output = $_[0]; $output =~ s/\^C\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^C/) { - $temp = ''._recurseCrumbTrail($session{page}{parentId}).''.$session{page}{title}.''; - $output =~ s/\^C/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/D_date.pm b/lib/WebGUI/Macro/D_date.pm index a21e5cabb..034592fd1 100644 --- a/lib/WebGUI/Macro/D_date.pm +++ b/lib/WebGUI/Macro/D_date.pm @@ -28,18 +28,10 @@ sub _replacement { #------------------------------------------------------------------- sub process { - my ($output, $temp, @param); + my ($output); $output = $_[0]; $output =~ s/\^D\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^D\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^D(.*)\^\/D/) { - $temp = epochToHuman(time(),$1); - $output =~ s/\^D(.*)\^\/D/$temp/g; - } elsif ($output =~ /\^D/) { - $temp = localtime(time); - $output =~ s/\^D/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm index 4fcaab270..7fac81689 100644 --- a/lib/WebGUI/Macro/H_homeLink.pm +++ b/lib/WebGUI/Macro/H_homeLink.pm @@ -35,14 +35,6 @@ sub process { $output = $_[0]; $output =~ s/\^H\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^H\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^H(.*)\^\/H/) { - $temp = ''.$1.''; - $output =~ s/\^H(.*)\^\/H/$temp/g; - } elsif ($output =~ /\^H/) { - $temp = ''.WebGUI::International::get(47).''; - $output =~ s/\^H/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/Hash_userId.pm b/lib/WebGUI/Macro/Hash_userId.pm index 9ded99a2d..15eaf9efd 100644 --- a/lib/WebGUI/Macro/Hash_userId.pm +++ b/lib/WebGUI/Macro/Hash_userId.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^\#\;/$session{user}{userId}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^\#/) { - $output =~ s/\^\#/$session{user}{userId}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm index e257627ef..8a8afa697 100644 --- a/lib/WebGUI/Macro/L_loginBox.pm +++ b/lib/WebGUI/Macro/L_loginBox.pm @@ -47,30 +47,6 @@ sub process { my ($output, $temp); $output = $_[0]; $output =~ s/\^L\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^L/) { - $temp = '
'; - if ($session{var}{sessionId}) { - $temp .= WebGUI::International::get(48); - $temp .= ' '.$session{user}{username}.'. '; - $temp .= WebGUI::International::get(49); - $temp = WebGUI::Macro::Backslash_pageUrl::process($temp); - } else { - $temp .= '
'; - $temp .= WebGUI::Form::hidden("op","login").''; - $temp .= WebGUI::International::get(50); - $temp .= '
'; - $temp .= WebGUI::Form::text("username",12,30).'
'; - $temp .= WebGUI::International::get(51); - $temp .= '
'; - $temp .= WebGUI::Form::password("identifier",12,30).'
'; - $temp .= WebGUI::Form::submit(WebGUI::International::get(52)); - $temp .= '
'; - $temp .= 'Click here to register.'; - } - $temp .= '
'; - $output =~ s/\^L/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/M_currentMenuVertical.pm b/lib/WebGUI/Macro/M_currentMenuVertical.pm index 6f2c657de..8c5c7cd3c 100644 --- a/lib/WebGUI/Macro/M_currentMenuVertical.pm +++ b/lib/WebGUI/Macro/M_currentMenuVertical.pm @@ -35,18 +35,6 @@ sub process { $output = $_[0]; $output =~ s/\^M\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^M\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^M(.*)\^\/M/) { - $temp = ''; - $temp .= traversePageTree($session{page}{pageId},0,$1); - $temp .= ''; - $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/P_previousMenuVertical.pm b/lib/WebGUI/Macro/P_previousMenuVertical.pm index 793b3cdcb..7758e2c65 100644 --- a/lib/WebGUI/Macro/P_previousMenuVertical.pm +++ b/lib/WebGUI/Macro/P_previousMenuVertical.pm @@ -35,18 +35,6 @@ sub process { $output = $_[0]; $output =~ s/\^P\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^P\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^P(.*)\^\/P/) { - $temp = ''; - $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/S_specificMenuVertical.pm b/lib/WebGUI/Macro/S_specificMenuVertical.pm index 578fb42a7..88a8bcdb9 100644 --- a/lib/WebGUI/Macro/S_specificMenuVertical.pm +++ b/lib/WebGUI/Macro/S_specificMenuVertical.pm @@ -39,21 +39,6 @@ sub process { $output = $_[0]; $output =~ s/\^S\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^S\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - my ($pageTitle, $depth); - if ($output =~ /\^S(.*)\^\/S/) { - ($pageTitle,$depth) = split(/,/,$1); - if ($depth eq "") { - $depth = 0; - } - @data = WebGUI::SQL->quickArray("select pageId,title,urlizedTitle from page where urlizedTitle='$pageTitle'"); - $temp = ''; - if (defined $data[0] && WebGUI::Privilege::canViewPage($data[0])) { - $temp .= traversePageTree($data[0],1,$depth); - } - $temp .= ''; - $output =~ s/\^S(.*)\^\/S/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/Splat_random.pm b/lib/WebGUI/Macro/Splat_random.pm index 873e037ae..f06ac0059 100644 --- a/lib/WebGUI/Macro/Splat_random.pm +++ b/lib/WebGUI/Macro/Splat_random.pm @@ -32,14 +32,6 @@ sub process { $output = $_[0]; $output =~ s/\^\*\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^\*\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - 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/T_topMenuVertical.pm b/lib/WebGUI/Macro/T_topMenuVertical.pm index a9f55a77e..71541a999 100644 --- a/lib/WebGUI/Macro/T_topMenuVertical.pm +++ b/lib/WebGUI/Macro/T_topMenuVertical.pm @@ -34,18 +34,6 @@ sub process { $output = $_[0]; $output =~ s/\^T\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^T\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^T(.*)\^\/T/) { - $temp = ''; - $temp .= traversePageTree(1,0,$1); - $temp .= ''; - $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_account.pm b/lib/WebGUI/Macro/a_account.pm index b637a2ce8..284311892 100644 --- a/lib/WebGUI/Macro/a_account.pm +++ b/lib/WebGUI/Macro/a_account.pm @@ -35,14 +35,6 @@ sub process { $output = $_[0]; $output =~ s/\^a\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^a\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^a(.*)\^\/a/) { - $temp = ''.$1.''; - $output =~ s/\^a(.*)\^\/a/$temp/g; - } elsif ($output =~ /\^a/) { - $temp = ''.WebGUI::International::get(46).''; - $output =~ s/\^a/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/c_companyName.pm b/lib/WebGUI/Macro/c_companyName.pm index 2c177df24..7e1254e49 100644 --- a/lib/WebGUI/Macro/c_companyName.pm +++ b/lib/WebGUI/Macro/c_companyName.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^c\;/$session{setting}{companyName}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^c/) { - $output =~ s/\^c/$session{setting}{companyName}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/e_companyEmail.pm b/lib/WebGUI/Macro/e_companyEmail.pm index f176df92d..8fc78bd00 100644 --- a/lib/WebGUI/Macro/e_companyEmail.pm +++ b/lib/WebGUI/Macro/e_companyEmail.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^e\;/$session{setting}{companyEmail}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^e/) { - $output =~ s/\^e/$session{setting}{companyEmail}/g; - } return $output; } diff --git a/lib/WebGUI/Macro/m_currentMenuHorizontal.pm b/lib/WebGUI/Macro/m_currentMenuHorizontal.pm index 1bad30061..553f051d0 100644 --- a/lib/WebGUI/Macro/m_currentMenuHorizontal.pm +++ b/lib/WebGUI/Macro/m_currentMenuHorizontal.pm @@ -41,25 +41,6 @@ sub process { my ($output, $temp, @data, $sth, $first); $output = $_[0]; $output =~ s/\^m\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^m/) { - $temp = ''; - $first = 1; - $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{pageId} order by sequenceNumber"); - while (@data = $sth->array) { - if (WebGUI::Privilege::canViewPage($data[2])) { - if ($first) { - $first = 0; - } else { - $temp .= " · "; - } - $temp .= ''.$data[0].''; - } - } - $sth->finish; - $temp .= ''; - $output =~ s/\^m/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/p_previousMenuHorizontal.pm b/lib/WebGUI/Macro/p_previousMenuHorizontal.pm index 405a98536..25fcd176f 100644 --- a/lib/WebGUI/Macro/p_previousMenuHorizontal.pm +++ b/lib/WebGUI/Macro/p_previousMenuHorizontal.pm @@ -42,25 +42,6 @@ sub process { my ($output, $temp, @data, $sth, $first); $output = $_[0]; $output =~ s/\^p\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^p/) { - $temp = ''; - $first = 1; - $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{parentId} order by sequenceNumber"); - while (@data = $sth->array) { - if (WebGUI::Privilege::canViewPage($data[2])) { - if ($first) { - $first = 0; - } else { - $temp .= " · "; - } - $temp .= ''.$data[0].''; - } - } - $sth->finish; - $temp .= ''; - $output =~ s/\^p/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm index 5115c5959..15b9d051a 100644 --- a/lib/WebGUI/Macro/r_printable.pm +++ b/lib/WebGUI/Macro/r_printable.pm @@ -37,18 +37,6 @@ sub process { $output = $_[0]; $output =~ s/\^r\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^r\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^r(.*)\^\/r/) { - $temp = appendToUrl($session{env}{REQUEST_URI},'makePrintable=1'); - $temp = ''.$1.''; - $output =~ s/\^r(.*)\^\/r/$temp/g; - } elsif ($output =~ /\^r/) { - $temp = appendToUrl($session{env}{REQUEST_URI},'makePrintable=1'); - $temp = ''; - $temp .= WebGUI::International::get(53); - $temp .= ''; - $output =~ s/\^r/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/s_specificMenuHorizontal.pm b/lib/WebGUI/Macro/s_specificMenuHorizontal.pm index 84355a449..330139f04 100644 --- a/lib/WebGUI/Macro/s_specificMenuHorizontal.pm +++ b/lib/WebGUI/Macro/s_specificMenuHorizontal.pm @@ -45,27 +45,6 @@ sub process { $output = $_[0]; $output =~ s/\^s\((.*?)\)\;/_replacement($1)/ge; $output =~ s/\^s\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^s(.*)\^\/s/) { - $pageTitle = $1; - $temp = ''; - $first = 1; - ($parentId) = WebGUI::SQL->quickArray("select pageId from page where urlizedTitle='$pageTitle'"); - $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId='$parentId' order by sequenceNumber"); - while (@data = $sth->array) { - if (WebGUI::Privilege::canViewPage($data[2])) { - if ($first) { - $first = 0; - } else { - $temp .= " · "; - } - $temp .= ''.$data[0].''; - } - } - $sth->finish; - $temp .= ''; - $output =~ s/\^s(.*)\^\/s/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/t_topMenuHorizontal.pm b/lib/WebGUI/Macro/t_topMenuHorizontal.pm index 4b5cea518..34ea44a78 100644 --- a/lib/WebGUI/Macro/t_topMenuHorizontal.pm +++ b/lib/WebGUI/Macro/t_topMenuHorizontal.pm @@ -41,25 +41,6 @@ sub process { my ($output, $temp, @data, $sth, $first); $output = $_[0]; $output =~ s/\^t\;/_replacement()/ge; - #---everything below this line will go away in a later rev. - if ($output =~ /\^t/) { - $temp = ''; - $first = 1; - $sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=1 order by sequenceNumber"); - while (@data = $sth->array) { - if (WebGUI::Privilege::canViewPage($data[2])) { - if ($first) { - $first = 0; - } else { - $temp .= " · "; - } - $temp .= ''.$data[0].''; - } - } - $sth->finish; - $temp .= ''; - $output =~ s/\^t/$temp/g; - } return $output; } diff --git a/lib/WebGUI/Macro/u_companyUrl.pm b/lib/WebGUI/Macro/u_companyUrl.pm index 261ba8487..033156071 100644 --- a/lib/WebGUI/Macro/u_companyUrl.pm +++ b/lib/WebGUI/Macro/u_companyUrl.pm @@ -18,10 +18,6 @@ sub process { my ($output); $output = $_[0]; $output =~ s/\^u\;/$session{setting}{companyURL}/g; - #---everything below this line will go away in a later rev. - if ($output =~ /\^u/) { - $output =~ s/\^u/$session{setting}{companyURL}/g; - } return $output; } diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm index 453375b7e..63c42b4fd 100644 --- a/lib/WebGUI/Operation/Account.pm +++ b/lib/WebGUI/Operation/Account.pm @@ -34,7 +34,7 @@ our %ldapStatusCode = ( 0=>'success (0)', 1=>'Operations Error (1)', 2=>'Protoco sub _accountOptions { my ($output); $output = '