inc/app/cms/boxes/services/webhooks/access.php inc/app/cms/boxes/services/webhooks/index.php inc/app/cms/boxes/services/webhooks/service.php inc/app/sitetag/boxes/index/access.php inc/app/sitetag/boxes/index/index.php inc/app/sitetag/boxes/index/settings.php inc/app/sitetag/boxes/related/access.php inc/app/sitetag/boxes/related/index.php inc/app/sitetag/boxes/related/settings.php inc/app/sitetag/boxes/rpc/access.php inc/app/sitetag/boxes/rpc/index.php inc/app/sitetag/boxes/rpc/settings.php inc/app/sitetag/boxes/tags/access.php inc/app/sitetag/boxes/tags/index.php inc/app/sitetag/boxes/tags/settings.php inc/app/sitetag/conf/config.ini.php inc/app/sitetag/conf/properties.php inc/app/sitetag/conf/sets/keywords.ini.php inc/app/sitetag/docs/en/001-about-sitetag.html inc/app/sitetag/docs/en/002-tag-sets.html inc/app/sitetag/docs/en/003-boxes.html inc/app/sitetag/forms/edit/access.php inc/app/sitetag/forms/edit/index.php inc/app/sitetag/forms/edit/settings.php inc/app/sitetag/html/cloud.spt inc/app/sitetag/html/list-items.spt inc/app/sitetag/html/related.spt inc/app/sitetag/html/tags.js inc/app/sitetag/html/tags.spt inc/app/sitetag/install/install-mysql.sql inc/app/sitetag/lib/Filters.php inc/app/sitetag/lib/TagCloud.php inc/app/sitetag/lib/Widget/Taginput.php inc/app/ui/boxes/comments/access.php inc/app/ui/boxes/comments/index.php inc/app/ui/boxes/comments/rpc/access.php inc/app/ui/boxes/comments/rpc/index.php inc/app/ui/boxes/comments/rpc/settings.php inc/app/ui/boxes/comments/settings.php inc/app/ui/boxes/rating/access.php inc/app/ui/boxes/rating/index.php inc/app/ui/boxes/rating/rpc/access.php inc/app/ui/boxes/rating/rpc/index.php inc/app/ui/boxes/rating/rpc/settings.php inc/app/ui/boxes/rating/settings.php inc/app/ui/boxes/reviews/.index.php.swp inc/app/ui/boxes/reviews/access.php inc/app/ui/boxes/reviews/index.php inc/app/ui/boxes/reviews/rpc/access.php inc/app/ui/boxes/reviews/rpc/index.php inc/app/ui/boxes/reviews/rpc/settings.php inc/app/ui/boxes/reviews/settings.php inc/app/ui/conf/config.ini.php inc/app/ui/conf/properties.php inc/app/ui/docs/en/001-overview.html inc/app/ui/docs/en/002-rating.html inc/app/ui/docs/en/003-comments.html inc/app/ui/html/comment-add.js inc/app/ui/html/comment-add.spt inc/app/ui/html/comment-item.spt inc/app/ui/html/comments.css inc/app/ui/html/comments.spt inc/app/ui/html/review-add.js inc/app/ui/html/review-add.spt inc/app/ui/html/review-item.spt inc/app/ui/install/INSTALL inc/app/ui/install/install-mysql.sql inc/app/ui/js/rpc.rating.js inc/app/ui/js/ui.stars.css inc/app/ui/js/ui.stars.gif inc/app/ui/js/ui.stars.js inc/app/ui/js/ui.stars.min.css inc/app/ui/js/ui.stars.min.js inc/app/ui/lib/Comments.php inc/app/ui/lib/Filters.php inc/app/ui/lib/Reviews.php inc/app/ui/lib/Widget/Rating.php inc/app/upgrade/boxes/5_0_3/index.php js/jquery-ui-1.7.2.min.js js/jquery.ajaxQueue.js js/jquery.autocomplete.css js/jquery.autocomplete.js js/jquery.autocomplete.pack.js js/jquery.bgiframe.min.js js/jquery.tinysort.js js/jquery.tinysort.min.js js/jquery.tinysort.packed.js js/thickbox-compressed.js js/thickbox.css @@ -33,10 +33,11 @@ class EditForm extends MailForm { $b =& $w->getButton (); $b->setValues (intl_get ('Save')); + $b->extra = 'onclick="onbeforeunload_form_submitted=true;"'; $b =& $w->addButton ('submit_button'); $b->setValues (intl_get ('Cancel')); - $b->extra = 'onclick="window.location.href = \'' . site_prefix () . '/index/appdoc-helpdoc-action?appname=' . $cgi->appname . '&lang=' . $cgi->lang . '\'; return false"'; + $b->extra = 'onclick="onbeforeunload_form_submitted=true; window.location.href = \'' . site_prefix () . '/index/appdoc-helpdoc-action?appname=' . $cgi->appname . '&lang=' . $cgi->lang . '\'; return false"'; } function onSubmit ($vals) { @@ -88,4 +89,4 @@ page_title (intl_get ('Editing Help File') . ': ' . $cgi->title); $form = new EditForm (); echo $form->run (); -?> \ No newline at end of file +?> inc/app/appdoc/boxes/helpdoc/edit/index.php @@ -59,7 +59,7 @@ fields = "id, body" [facet:owner] type = select -display = Ower +display = Owner values = "db_shift_array (`select distinct owner from sitewiki_page where owner != ''`)" -; */ ?> \ No newline at end of file +; */ ?> inc/app/cms/conf/collections/sitewiki_page.php @@ -14,6 +14,12 @@ name = Document Workflow Notifier handler = "box:cms/services/notice" +[service:cms_services_webhooks] + +name = Web Hooks + +handler = "box:cms/services/webhooks" + [service:multilingual_services_translation] name = Translator Workflow Notifier inc/app/cms/conf/services/add.php @@ -14,6 +14,12 @@ name = Move Children of Deleted Pages handler = "box:cms/services/movechildren" +[service:cms_services_webhooks] + +name = Web Hooks + +handler = "box:cms/services/webhooks" + ; ; THE END ; inc/app/cms/conf/services/delete.php @@ -20,6 +20,12 @@ name = Update Links handler = "box:cms/services/updatelinks" +[service:cms_services_webhooks] + +name = Web Hooks + +handler = "box:cms/services/webhooks" + [service:multilingual_services_translation] name = Translator Workflow Notifier inc/app/cms/conf/services/edit.php @@ -14,6 +14,12 @@ name = Activity Logger handler = "box:cms/services/log" +[service:cms_services_webhooks] + +name = Web Hooks + +handler = "box:cms/services/webhooks" + ; ; THE END ; inc/app/cms/conf/services/error.php @@ -8,6 +8,12 @@ ; Sitellite administrator first. ; +[service:cms_services_webhooks] + +name = Web Hooks + +handler = "box:cms/services/webhooks" + ; ; THE END ; inc/app/cms/conf/services/pre-delete.php @@ -28,7 +28,29 @@ setValues = "eval:array (0=>'ALL', 2=>2, 5=>5, 10=>10, 20=>20, 50= value = 20 +[cms_webhooks] + +alt = "Web Hooks (Sitellite will POST to these URLs on workflow events)" + +type = textarea + +value = "" + +extra = "style=`width: 100%`" + +[cms_webhooks_auth] + +alt = Web Hooks Authorization Key + +type = text + +value = "" + +extra = "size=`30`" + +append = " <a href=`#` onclick=`var f=function(){var c='01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';var r='';for(var i=0;i<32;i++){s=Math.floor(Math.random()*c.length);r+=c.substring(s,s+1);}return r;};document.getElementById('cms_webhooks_auth').value=f()`>Auto-Generate</a>" + ; ; THE END ; -; DO NOT ALTER THIS LINE, IT IS HERE FOR SECURITY REASONS */ ?> +; DO NOT ALTER THIS LINE, IT IS HERE FOR SECURITY REASONS */ ?> \ No newline at end of file inc/app/cms/conf/settings.ini.php @@ -257,7 +257,7 @@ class CmsAddSitellite_sidebarForm extends MailForm { $key = 'Unknown'; } - if (! empty ($return)) { + if (empty ($return)) { $return = site_prefix () . '/index/cms-browse-action?collection=sitellite_sidebar'; } inc/app/cms/forms/add/sitellite_sidebar/index.php @@ -1,6 +1,5 @@ <link rel="stylesheet" type="text/css" href="{site/prefix}/js/prompt.css" /> -<script language="javascript" src="{site/prefix}/js/prototype-compressed.js"></script> -<script language="javascript" src="{site/prefix}/js/scriptaculous/scriptaculous.js"></script> +<script language="javascript" src="{site/prefix}/js/jquery-1.3.2.min.js"></script> <script language="javascript" src="{site/prefix}/js/prompt-compressed.js"></script> <script language="javascript"> inc/app/cms/html/alert.spt @@ -37,7 +37,7 @@ function imagechooser_{name}_view (file, w, h) { 'ImageChooser', 'top=50,left=50,width=' + (w + 30) + ',height=' + (h + 60) + ',toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,fullscreen=no' ); - win.document.write ('<html><head><title>' + file + '</title></head>'); + win.document.write ('<html><head><title>' + file + '</title><' + '/head>'); win.document.write ('<body><p align="center"><a href="javascript: window.close ()"><img src="' + file + '" alt="{intl Click to close}" title="{intl Click to close}" border="0" /></a></p>'); win.document.write ('<p align="center" style="font: 12px Verdana, Arial, sans-serif"><a href="javascript: window.close ()" style="text-decoration: none; color: #d60">{intl Close Window}</a></p></body></html>'); win.document.close (); inc/app/imagechooser/html/js.spt @@ -1 +1 @@ -<?php // BEGIN KEEPOUT CHECKING // Add these lines to the very top of any file you don't want people to // be able to access directly. if (! defined ('SAF_VERSION')) { header ('HTTP/1.1 404 Not Found'); echo "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n" . "<html><head>\n<title>404 Not Found</title>\n</head><body>\n<h1>Not Found</h1>\n" . "The requested URL " . $PHP_SELF . " was not found on this server.<p>\n<hr>\n" . $_SERVER['SERVER_SIGNATURE'] . "</body></html>"; exit; } // END KEEPOUT CHECKING loader_box ('sitellite/nav/init'); // import any object we need from the global namespace global $page, $menu; // box logic begins here if ($parameters['recursive'] == 'no') { $recur = false; } else { $recur = true; } //page_id ('sitemap'); if ($context == 'action') { page_title (intl_get ('Site Map')); } page_add_script (site_prefix () . '/js/jquery-1.2.3.min.js'); page_add_script (site_prefix () . '/js/jquery.cookie.js'); page_add_script (site_prefix () . '/js/jquery-treeview/jquery.treeview.min.js'); page_add_style (site_prefix () . '/js/jquery-treeview/jquery.treeview.css'); page_add_script ('<script type="text/javascript"> $(function () { $("#sitemap").treeview ({ animated: "medium", control: "#sidetreecontrol", persist: "location" }); }); </script>'); page_add_style ('<style type="text/css"> ul#sitemap>li>a { font-weight: bold; } </style>'); echo preg_replace ('/^<ul>/', '<ul id="sitemap" class="treeview-gray">', $menu->display ('html', '<a href="{site/prefix}/index/{id}">{title}</a>', $recur)); ?> \ No newline at end of file +<?php // BEGIN KEEPOUT CHECKING // Add these lines to the very top of any file you don't want people to // be able to access directly. if (! defined ('SAF_VERSION')) { header ('HTTP/1.1 404 Not Found'); echo "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n" . "<html><head>\n<title>404 Not Found</title>\n</head><body>\n<h1>Not Found</h1>\n" . "The requested URL " . $PHP_SELF . " was not found on this server.<p>\n<hr>\n" . $_SERVER['SERVER_SIGNATURE'] . "</body></html>"; exit; } // END KEEPOUT CHECKING loader_box ('sitellite/nav/init'); // import any object we need from the global namespace global $page, $menu; // box logic begins here if ($parameters['recursive'] == 'no') { $recur = false; } else { $recur = true; } //page_id ('sitemap'); if ($context == 'action') { page_title (intl_get ('Site Map')); } page_add_script (site_prefix () . '/js/jquery-1.3.2.min.js'); page_add_script (site_prefix () . '/js/jquery.cookie.js'); page_add_script (site_prefix () . '/js/jquery-treeview/jquery.treeview.min.js'); page_add_style (site_prefix () . '/js/jquery-treeview/jquery.treeview.css'); page_add_script ('<script type="text/javascript"> $(function () { $("#sitemap").treeview ({ animated: "medium", control: "#sidetreecontrol", persist: "location" }); }); </script>'); page_add_style ('<style type="text/css"> ul#sitemap>li>a { font-weight: bold; } </style>'); echo preg_replace ('/^<ul>/', '<ul id="sitemap" class="treeview-gray">', $menu->display ('html', '<a href="{site/prefix}/index/{id}">{title}</a>', $recur)); ?> \ No newline at end of file inc/app/sitellite/boxes/nav/sitemap/index.php @@ -47,7 +47,7 @@ $data = array ( 'template_sets' => array (), ); -page_title (intl_get ('Choose a Template')); +page_title (intl_get ('Choose a Template Set')); $path = session_get ('sitetemplate_path'); @@ -93,4 +93,4 @@ foreach($template_sets->readAll() as $file) template_simple_register ('cgi', $cgi); echo template_simple ('index.spt', $data); -?> \ No newline at end of file +?> inc/app/sitetemplate/boxes/index/index.php @@ -59,9 +59,10 @@ class SitetemplateEditForm extends MailForm { list ($set, $tpl) = explode ('/', $vals['path']); - page_title ('Template Saved'); - echo '<p><a href="' . site_prefix () . '/index/sitetemplate-templateselect-action?set_name=' . $set . '">' . intl_get ('Return to template set') . '</a></p>'; + session_set ('sitellite_alert', intl_get ('Template Saved')); + header ('Location: ' . site_prefix () . '/index/sitetemplate-templateselect-action?set_name=' . $set); + exit; } } -?> \ No newline at end of file +?> inc/app/sitetemplate/forms/edit/index.php @@ -2,6 +2,7 @@ global $cgi; +@touch ('inc/html/' . $cgi->set . '/config.ini.php'); if (! @is_writable('inc/html/' . $cgi->set) || ! @is_writable('inc/html/' . $cgi->set . '/config.ini.php')) { page_title (intl_get ('An Error Occurred')); echo '<p>' . intl_get ('Your template is not writeable by Sitellite. Please adjust your server settings to continue.') . '</p>'; @@ -63,4 +64,4 @@ class SitetemplateEditsetForm extends MailForm { } } -?> \ No newline at end of file +?> inc/app/sitetemplate/forms/editset/index.php @@ -28,7 +28,7 @@ function imagechooser_view (file, w, h) { 'Image Viewer', 'top=50,left=50,width=' + (w + 30) + ',height=' + (h + 60) + ',toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,fullscreen=no' ); - win.document.write ('<html><head><title>' + file + '</title></head>'); + win.document.write ('<html><head><title>' + file + '</title><' + '/head>'); win.document.write ('<body><p align="center"><a href="javascript: window.close ()"><img src="' + file + '" alt="{intl Click to close}" title="{intl Click to close}" border="0" /></a></p>'); win.document.write ('<p align="center" style="font: 12px Verdana, Arial, sans-serif"><a href="javascript: window.close ()" style="text-decoration: none; color: #d60">{intl Close Window}</a></p></body></html>'); return false; inc/app/sitetemplate/html/templateselect.spt @@ -15,7 +15,8 @@ function sitetemplate_preview (f) { } function sitetemplate_url_encode (text) { - orig = [/%/g, /(\r\n|\n\r|\r|\n)/g, /#/g, /&/g, /\(/g, /\)/g, /\//g, /:/g, /;/g, /=/g, / /g, /</g, />/g, /\{/g, /\}/g]; + orig = [/%/g, /(\r\n|\n\r|\r|\n)/g, /#/g, /&/g, /\(/g, /\)/g, /\//g, /:/g, /;/g, /=/g, / /g, /</g, />/g, /\{/g, + /\}/g]; uenc = ['%25', '%0D%0A', '%23', '%26', '%28', '%29', '%2F', '%3A', '%3B', '%3C', '+', '%3D', '%3E', '%7B', '%7D']; for (i = 0; i < orig.length; i++) { text = text.replace (orig[i], uenc[i]); inc/app/sitetemplate/html/tpl_submit.spt @@ -58,7 +58,7 @@ fields = "id, body" [facet:owner] type = select -display = Ower +display = Owner values = "db_shift_array (`select distinct owner from sitewiki_page where owner != ''`)" -; */ ?> \ No newline at end of file +; */ ?> inc/app/sitewiki/install/sitewiki_page.php @@ -55,8 +55,10 @@ class UsradmSettingsForm extends MailForm { die ('Error writing to file: inc/conf/config.ini.php'); } - echo '<p>' . intl_get ('Site settings saved.') . ' <a href="' . site_prefix () . '/index/cms-cpanel-action">' . intl_get ('Continue') . '</a></p>'; + session_set ('sitellite_alert', intl_get ('Site settings saved.')); + header ('Location: ' . site_prefix () . '/index/cms-cpanel-action'); + exit; } } -?> \ No newline at end of file +?> inc/app/usradm/forms/settings/index.php @@ -2,8 +2,7 @@ <head> <title>{page/title}</title> <link rel="stylesheet" type="text/css" href="{site/prefix}/js/prompt.css" /> - <script language="javascript" type="text/javascript" src="{site/prefix}/js/prototype.js"></script> - <script language="javascript" type="text/javascript" src="{site/prefix}/js/scriptaculous/scriptaculous.js"></script> + <script language="javascript" type="text/javascript" src="{site/prefix}/js/jquery-1.3.2.min.js"></script> <script language="javascript" type="text/javascript" src="{site/prefix}/js/prompt.js"></script> <script language="javascript" type="text/javascript" src="{site/prefix}/js/dialog.js"></script> <script language="javascript" type="text/javascript" src="{site/prefix}/js/rpc.js"></script> inc/app/wffolderbrowser/html/browser.spt @@ -5,8 +5,9 @@ global $cgi; $cgi->html = the_cleaners ($cgi->html); page_add_style (site_prefix () . '/js/prompt.css'); -page_add_script (site_prefix () . '/js/prototype.js'); -page_add_script (site_prefix () . '/js/scriptaculous/scriptaculous.js'); +//page_add_script (site_prefix () . '/js/prototype.js'); +//page_add_script (site_prefix () . '/js/scriptaculous/scriptaculous.js'); +page_add_script (site_prefix () . '/js/jquery-1.3.2.min.js'); page_add_script (site_prefix () . '/js/prompt.js'); class XedSourceForm extends MailForm { inc/app/xed/forms/source/index.php @@ -66,7 +66,9 @@ compress_output = Off error_reporting = "E_ALL ^ E_NOTICE" -xsendfile = readfile +xsendfile = readfile + +default_timezone = UTC [I18n] @@ -78,31 +80,31 @@ serialize = plain [Messaging] -return_address = "" +return_address = Off -email_server = "" +email_server = Off email_port = 110 -email_username = "" +email_username = Off -email_password = "" +email_password = Off jabber = Off -jabber_server = "" +jabber_server = Off jabber_port = 5222 -jabber_username = "" +jabber_username = Off -jabber_password = "" +jabber_password = Off [Services] -recaptcha_public_key = "" +recaptcha_public_key = Off -recaptcha_private_key = "" +recaptcha_private_key = Off ; ; THE END inc/conf/config.ini.php @@ -57,7 +57,9 @@ if (file_exists ('inc/conf/product.php')) { // set the error_reporting level eval ('?' . '><?php error_reporting (' . $conf['Server']['error_reporting'] . '); ?' . '>'); - +if (function_exists ('date_default_timezone_set') && $conf['Server']['default_timezone']) { + date_default_timezone_set ($conf['Server']['default_timezone']); +} // split values which should be arrays //$conf['Cache']['cacheable'] = preg_split ('/, ?/', $conf['Cache']['cacheable']); /*************************************************************************/ index @@ -79,6 +79,22 @@ Changes in 5.0.3-stable - Added option to replace an image file in imagechooser [#144]. - Modified the way news story are splitted for better printing [#32]. - Added possibility to upload many files together [#84]. +- Improved the email validation rules in saf.MailForm.Rule. +- Fixed javascript rendering bug in SiteTemplate [#146]. +- Use alert in sitetemplate-edit-form. +- Fixed an issue in sitetemplate. Create config file if it doesn't exist. +- Fixed an issue with onbeforeload in AppDoc. +- SiteTag application (first draft). +- Use alert in usradm-settings-form. +- Added autocompleted input box for sitetag. +- Fixed a javascript error in the SiteTemplate edit form. +- Added star rating ui component. +- Added comments ui component. +- Added web hooks to the CMS app settings and workflow services. +- Removed prompt.js dependence on prototype.js, uses jquery instead. +- Fixed a js error on the site maps, loading 2 versions of jquery. +- Fixing PHP 5.3 compatibility issues and warnings. +- Added reviews ui component. Changes in 5.0.2-stable install/changes.txt @@ -1673,3 +1673,36 @@ create table myadm_report_results ( results mediumtext not null, index (report_id, run) ); + +CREATE TABLE `ui_comment` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(128) NOT NULL, + `email` varchar(128) NOT NULL, + `website` varchar(256) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `ip` varchar(15) NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`id`), + KEY `item_group` (`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_rating` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `rating` int(11) default NULL, + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_review` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; install/install-mysql.sql @@ -507,6 +507,7 @@ create table sitellite_news ( author char(72) not null, category char(48) not null, summary text not null, + external char(128) not null, sitellite_status varchar(32) NOT NULL default '', sitellite_access varchar(32) NOT NULL default '', sitellite_startdate datetime default NULL, @@ -1671,3 +1672,36 @@ create table myadm_report_results ( results mediumtext not null, index (report_id, run) ); + +CREATE TABLE `ui_comment` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(128) NOT NULL, + `email` varchar(128) NOT NULL, + `website` varchar(256) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `ip` varchar(15) NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`id`), + KEY `item_group` (`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_rating` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `rating` int(11) default NULL, + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_review` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; install/install-old.sql @@ -1 +1 @@ -var prompter_list=[];function prompt(B,A,C){p=new Prompter(C);p.open(B,A)}function Prompter(A){this.agent=navigator.userAgent.toLowerCase();this.msie=((this.agent.indexOf("msie")!=-1)&&(this.agent.indexOf("opera")==-1));this.width=300;this.height=125;this.popup=null;this.handler=A;this.type="text";this.options=[];this.maxlength=false;prompter_list.push(this);this.num=prompter_list.length-1}Prompter.prototype.open=function(A){if(arguments.length>1){default_value=arguments[1]}else{default_value=""}this.popup=document.createElement("div");w=this.popup;w.setAttribute("id","prompt-dialog-"+this.num);label=document.createElement("p");label.setAttribute("class","label");label.setAttribute("className","label");label.appendChild(document.createTextNode(A));w.appendChild(label);form=document.createElement("form");p1=document.createElement("p");p1.setAttribute("align","center");form.appendChild(p1);w.appendChild(form);margin_top=scrollbar_offset();switch(this.type){case"select":w.setAttribute("class","prompt-window");w.setAttribute("className","prompt-window");e=document.createElement("select");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");for(i=0;i<this.options.length;i++){o=document.createElement("option");o.setAttribute("value",this.options[i]);if(this.options[i].value==default_value){o.setAttribute("selected","selected")}o.appendChild(document.createTextNode(this.options[i]));e.appendChild(o)}p1.appendChild(e);break;case"textarea":w.setAttribute("class","prompt-window-textarea");w.setAttribute("className","prompt-window-textarea");e=document.createElement("textarea");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");e.setAttribute("cols",this.cols);e.setAttribute("rows",this.rows);e.style.overflow="hidden";if(this.height){w.style.height=this.height;margin_top+=Math.round(this.height/3)*-1}if(this.width){w.style.width=this.width;w.style.marginLeft=Math.round(this.width/2)*-1}e.appendChild(document.createTextNode(default_value));p1.appendChild(e);break;case"text":default:w.setAttribute("class","prompt-window");w.setAttribute("className","prompt-window");e=document.createElement("input");e.setAttribute("type","text");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");e.setAttribute("size","30");if(this.maxlength){e.setAttribute("maxlength",this.maxlength)}e.setAttribute("value",default_value);p1.appendChild(e);break}w.style.marginTop=margin_top;p2=document.createElement("p");p2.setAttribute("align","center");num=document.createElement("input");num.setAttribute("type","hidden");num.setAttribute("name","num");num.setAttribute("value",this.num);num.setAttribute("id","prompt-window-num");ok=document.createElement("input");ok.setAttribute("type","submit");ok.setAttribute("value","OK");ok.onclick=function(){if(document.all){n=this.form.elements["prompt-window-num"].value;prompter_list[n].reply(document.getElementById("prompt-window-"+n+"-user").value)}else{prompter_list[this.form.elements.num.value].reply(this.form.elements.user.value)}return false};cancel=document.createElement("input");cancel.setAttribute("type","submit");cancel.setAttribute("value","Cancel");cancel.onclick=function(){if(document.all){prompter_list[this.form.elements["prompt-window-num"].value].reply(false)}else{prompter_list[this.form.elements.num.value].reply(false)}return false};p2.appendChild(num);p2.appendChild(ok);p2.appendChild(document.createTextNode(" \u00a0 "));p2.appendChild(cancel);form.appendChild(p2);alert_timeout_end(true);textareas=document.getElementsByTagName("textarea");for(i=0;i<textareas.length;i++){if(textareas[i].getAttribute("id")!="prompt-window-"+this.num+"-user"){textareas[i].style.overflow="hidden"}}iframes=document.getElementsByTagName("iframe");for(i=0;i<iframes.length;i++){iframes[i].style.overflow="hidden"}if(document.all){document.body.appendChild(w)}else{body=document.getElementsByTagName("body")[0];body.appendChild(w)}new Effect.BlindDown("prompt-dialog-"+this.num,{duration:1,afterFinish:function(B){n=B.element.id.split("-")[2];document.getElementById("prompt-window-"+n+"-user").style.overflow="auto";document.getElementById("prompt-window-"+n+"-user").focus()}});return false};Prompter.prototype.reply=function(A){if(this.type=="textarea"){document.getElementById("prompt-window-"+this.num+"-user").style.overflow="hidden"}new Effect.BlindUp("prompt-dialog-"+this.num,{duration:1});textareas=document.getElementsByTagName("textarea");for(i=0;i<textareas.length;i++){if(textareas[i].getAttribute("id")!="prompt-window-"+this.num+"-user"){textareas[i].style.overflow="auto"}}iframes=document.getElementsByTagName("iframe");for(i=0;i<iframes.length;i++){iframes[i].style.overflow="auto"}this.handler(A);return false};var alert_timeout=false;var alert_loaded=false;var alert_select_boxes=[];function alert_timeout_end(){if(arguments.length>0){display=true}else{display=false}if(alert_timeout){window.clearTimeout(alert_timeout)}if(display){e=document.getElementById("alert-window");if(e){e.style.display="none"}}}function alert(A){if(arguments.length>1){dur=arguments[1]*1000}else{dur=3000}msie=((navigator.userAgent.toLowerCase().indexOf("msie")!=-1)&&(navigator.userAgent.toLowerCase().indexOf("opera")==-1));alert_timeout_end(true);if(!alert_loaded){w=document.createElement("div");w.setAttribute("class","alert-window");w.setAttribute("className","alert-window");w.setAttribute("id","alert-window");w.onclick=function(){alert_timeout_end();new Effect.BlindUp("alert-window",{duration:1})};table=Builder.node("table",{width:"300px",height:"100px",border:"0"});tbody=Builder.node("tbody");tr=Builder.node("tr");td=Builder.node("td",{align:"center",valign:"middle",id:"alert-window-contents"});td.innerHTML=A;tr.appendChild(td);tbody.appendChild(tr);table.appendChild(tbody);w.appendChild(table);w.style.marginTop=scrollbar_offset();if(document.all){document.body.appendChild(w)}else{body=document.getElementsByTagName("body")[0];body.appendChild(w)}alert_loaded=true}else{document.getElementById("alert-window").style.marginTop=scrollbar_offset();document.getElementById("alert-window-contents").innerHTML=A}if(msie){boxes=document.getElementsByTagName("select");alert_select_boxes=[];for(i=0;i<boxes.length;i++){if(boxes[i].style.display!="none"){boxes[i].style.display="none";alert_select_boxes.push(boxes[i])}}}new Effect.BlindDown("alert-window",{duration:1});alert_timeout=window.setTimeout(function(){new Effect.BlindUp("alert-window",{duration:1});msie=((navigator.userAgent.toLowerCase().indexOf("msie")!=-1)&&(navigator.userAgent.toLowerCase().indexOf("opera")==-1));if(msie){for(i=0;i<alert_select_boxes.length;i++){alert_select_boxes[i].style.display="inline"}alert_select_boxes=[]}alert_timeout_end()},dur);return false}function scrollbar_offset(){return scrollbar_offset_filter_results(window.pageYOffset?window.pageYOffset:0,document.documentElement?document.documentElement.scrollTop:0,document.body?document.body.scrollTop:0)}function scrollbar_offset_filter_results(D,B,A){var C=D?D:0;if(B&&(!C||(C>B))){C=B}return A&&(!C||(C>A))?A:C}; \ No newline at end of file +var prompter_list=[];function prompt(B,A,C){p=new Prompter(C);p.open(B,A)}function Prompter(A){this.agent=navigator.userAgent.toLowerCase();this.msie=((this.agent.indexOf("msie")!=-1)&&(this.agent.indexOf("opera")==-1));this.width=300;this.height=125;this.popup=null;this.handler=A;this.type="text";this.options=[];this.maxlength=false;prompter_list.push(this);this.num=prompter_list.length-1}Prompter.prototype.open=function(A){if(arguments.length>1){default_value=arguments[1]}else{default_value=""}this.popup=document.createElement("div");w=this.popup;w.setAttribute("id","prompt-dialog-"+this.num);label=document.createElement("p");label.setAttribute("class","label");label.setAttribute("className","label");label.appendChild(document.createTextNode(A));w.appendChild(label);form=document.createElement("form");p1=document.createElement("p");p1.setAttribute("align","center");form.appendChild(p1);w.appendChild(form);margin_top=scrollbar_offset();switch(this.type){case"select":w.setAttribute("class","prompt-window");w.setAttribute("className","prompt-window");e=document.createElement("select");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");for(i=0;i<this.options.length;i++){o=document.createElement("option");o.setAttribute("value",this.options[i]);if(this.options[i].value==default_value){o.setAttribute("selected","selected")}o.appendChild(document.createTextNode(this.options[i]));e.appendChild(o)}p1.appendChild(e);break;case"textarea":w.setAttribute("class","prompt-window-textarea");w.setAttribute("className","prompt-window-textarea");e=document.createElement("textarea");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");e.setAttribute("cols",this.cols);e.setAttribute("rows",this.rows);e.style.overflow="hidden";if(this.height){w.style.height=this.height;margin_top+=Math.round(this.height/3)*-1}if(this.width){w.style.width=this.width;w.style.marginLeft=Math.round(this.width/2)*-1}e.appendChild(document.createTextNode(default_value));p1.appendChild(e);break;case"text":default:w.setAttribute("class","prompt-window");w.setAttribute("className","prompt-window");e=document.createElement("input");e.setAttribute("type","text");e.setAttribute("name","user");e.setAttribute("id","prompt-window-"+this.num+"-user");e.setAttribute("size","30");if(this.maxlength){e.setAttribute("maxlength",this.maxlength)}e.setAttribute("value",default_value);p1.appendChild(e);break}w.style.marginTop=margin_top;p2=document.createElement("p");p2.setAttribute("align","center");num=document.createElement("input");num.setAttribute("type","hidden");num.setAttribute("name","num");num.setAttribute("value",this.num);num.setAttribute("id","prompt-window-num");ok=document.createElement("input");ok.setAttribute("type","submit");ok.setAttribute("value","OK");ok.onclick=function(){if(document.all){n=this.form.elements["prompt-window-num"].value;prompter_list[n].reply(document.getElementById("prompt-window-"+n+"-user").value)}else{prompter_list[this.form.elements.num.value].reply(this.form.elements.user.value)}return false};cancel=document.createElement("input");cancel.setAttribute("type","submit");cancel.setAttribute("value","Cancel");cancel.onclick=function(){if(document.all){prompter_list[this.form.elements["prompt-window-num"].value].reply(false)}else{prompter_list[this.form.elements.num.value].reply(false)}return false};p2.appendChild(num);p2.appendChild(ok);p2.appendChild(document.createTextNode(" \u00a0 "));p2.appendChild(cancel);form.appendChild(p2);alert_timeout_end(true);textareas=document.getElementsByTagName("textarea");for(i=0;i<textareas.length;i++){if(textareas[i].getAttribute("id")!="prompt-window-"+this.num+"-user"){textareas[i].style.overflow="hidden"}}iframes=document.getElementsByTagName("iframe");for(i=0;i<iframes.length;i++){iframes[i].style.overflow="hidden"}if(document.all){document.body.appendChild(w)}else{body=document.getElementsByTagName("body")[0];body.appendChild(w)}$("#prompt-dialog-"+this.num).slideDown("normal",function(){n=obj.element.id.split("-")[2];document.getElementById("prompt-window-"+n+"-user").style.overflow="auto";document.getElementById("prompt-window-"+n+"-user").focus()});return false};Prompter.prototype.reply=function(A){if(this.type=="textarea"){document.getElementById("prompt-window-"+this.num+"-user").style.overflow="hidden"}$("#prompt-dialog-"+this.num).slideUp();textareas=document.getElementsByTagName("textarea");for(i=0;i<textareas.length;i++){if(textareas[i].getAttribute("id")!="prompt-window-"+this.num+"-user"){textareas[i].style.overflow="auto"}}iframes=document.getElementsByTagName("iframe");for(i=0;i<iframes.length;i++){iframes[i].style.overflow="auto"}this.handler(A);return false};var alert_timeout=false;var alert_loaded=false;var alert_select_boxes=[];function alert_timeout_end(){if(arguments.length>0){display=true}else{display=false}if(alert_timeout){window.clearTimeout(alert_timeout)}if(display){e=document.getElementById("alert-window");if(e){e.style.display="none"}}}function alert(A){if(arguments.length>1){dur=arguments[1]*1000}else{dur=3000}msie=((navigator.userAgent.toLowerCase().indexOf("msie")!=-1)&&(navigator.userAgent.toLowerCase().indexOf("opera")==-1));alert_timeout_end(true);if(!alert_loaded){w=document.createElement("div");w.setAttribute("class","alert-window");w.setAttribute("className","alert-window");w.setAttribute("id","alert-window");w.onclick=function(){alert_timeout_end();$("#alert-window").slideUp()};table=$('<table width="300px" height="100px" border="0"></table>');tbody=$("<tbody></tbody>");tr=$("<tr></tr>");td=$('<td align="center" valign="middle" id="alert-window-contents"></td>');td.html(A);tr.html(td);tbody.html(tr);table.html(tbody);$(w).append(table);w.style.marginTop=scrollbar_offset();if(document.all){document.body.appendChild(w)}else{body=document.getElementsByTagName("body")[0];body.appendChild(w)}alert_loaded=true}else{document.getElementById("alert-window").style.marginTop=scrollbar_offset();document.getElementById("alert-window-contents").innerHTML=A}if(msie){boxes=document.getElementsByTagName("select");alert_select_boxes=[];for(i=0;i<boxes.length;i++){if(boxes[i].style.display!="none"){boxes[i].style.display="none";alert_select_boxes.push(boxes[i])}}}$("#alert-window").slideDown();alert_timeout=window.setTimeout(function(){$("#alert-window").slideUp();msie=((navigator.userAgent.toLowerCase().indexOf("msie")!=-1)&&(navigator.userAgent.toLowerCase().indexOf("opera")==-1));if(msie){for(i=0;i<alert_select_boxes.length;i++){alert_select_boxes[i].style.display="inline"}alert_select_boxes=[]}alert_timeout_end()},dur);return false}function scrollbar_offset(){return scrollbar_offset_filter_results(window.pageYOffset?window.pageYOffset:0,document.documentElement?document.documentElement.scrollTop:0,document.body?document.body.scrollTop:0)}function scrollbar_offset_filter_results(D,B,A){var C=D?D:0;if(B&&(!C||(C>B))){C=B}return A&&(!C||(C>A))?A:C}; \ No newline at end of file js/prompt-compressed.js @@ -316,11 +316,16 @@ Prompter.prototype.open = function (txt) { body = document.getElementsByTagName ('body')[0]; body.appendChild (w); } - new Effect.BlindDown ('prompt-dialog-' + this.num, {duration: 1, afterFinish: function (obj) { + /*new Effect.BlindDown ('prompt-dialog-' + this.num, {duration: 1, afterFinish: function (obj) { n = obj.element.id.split ('-')[2]; document.getElementById ('prompt-window-' + n + '-user').style.overflow = 'auto'; document.getElementById ('prompt-window-' + n + '-user').focus (); - }}); + }});*/ + $('#prompt-dialog-' + this.num).slideDown ('normal', function () { + n = obj.element.id.split ('-')[2]; + document.getElementById ('prompt-window-' + n + '-user').style.overflow = 'auto'; + document.getElementById ('prompt-window-' + n + '-user').focus (); + }); return false; } @@ -337,7 +342,8 @@ Prompter.prototype.reply = function (reply) { if (this.type == 'textarea') { document.getElementById ('prompt-window-' + this.num + '-user').style.overflow = 'hidden'; } - new Effect.BlindUp ('prompt-dialog-' + this.num, {duration: 1}); + //new Effect.BlindUp ('prompt-dialog-' + this.num, {duration: 1}); + $('#prompt-dialog-' + this.num).slideUp (); textareas = document.getElementsByTagName ('textarea'); for (i = 0; i < textareas.length; i++) { @@ -414,18 +420,19 @@ function alert (txt) { w.setAttribute ('id', 'alert-window'); w.onclick = function () { alert_timeout_end (); - new Effect.BlindUp ('alert-window', {duration: 1}); + //new Effect.BlindUp ('alert-window', {duration: 1}); + $('#alert-window').slideUp (); }; - table = Builder.node ('table', {width: '300px', height: '100px', border: '0'}); - tbody = Builder.node ('tbody'); - tr = Builder.node ('tr'); - td = Builder.node ('td', {align: 'center', valign: 'middle', id: 'alert-window-contents'}); - td.innerHTML = txt; + table = $('<table width="300px" height="100px" border="0"></table>'); + tbody = $('<tbody></tbody>'); + tr = $('<tr></tr>'); + td = $('<td align="center" valign="middle" id="alert-window-contents"></td>'); + td.html (txt); - tr.appendChild (td); - tbody.appendChild (tr); - table.appendChild (tbody); - w.appendChild (table); + tr.html (td); + tbody.html (tr); + table.html (tbody); + $(w).append (table); w.style.marginTop = scrollbar_offset (); @@ -454,11 +461,13 @@ function alert (txt) { } } - new Effect.BlindDown ('alert-window', {duration: 1}); + //new Effect.BlindDown ('alert-window', {duration: 1}); + $('#alert-window').slideDown (); alert_timeout = window.setTimeout ( function () { - new Effect.BlindUp ('alert-window', {duration: 1}); + //new Effect.BlindUp ('alert-window', {duration: 1}); + $('#alert-window').slideUp (); msie = ((navigator.userAgent.toLowerCase ().indexOf ('msie') != -1) && (navigator.userAgent.toLowerCase ().indexOf ('opera') == -1)); js/prompt.js @@ -452,7 +452,7 @@ class Menu { * */ function &addItem ($id, $title, $ref = '', $sect = '', $template = '') { - $this->{'items_' . $id} =& new MenuItem ($id, $title); + $this->{'items_' . $id} = new MenuItem ($id, $title); if (empty ($ref)) { $this->tree[] =& $this->{'items_' . $id}; } else { saf/lib/GUI/Menu.php @@ -1,8 +1,9 @@ <?php page_add_style (site_prefix () . '/js/prompt.css'); -page_add_script (site_prefix () . '/js/prototype.js'); -page_add_script (site_prefix () . '/js/scriptaculous/scriptaculous.js'); +//page_add_script (site_prefix () . '/js/prototype.js'); +//page_add_script (site_prefix () . '/js/scriptaculous/scriptaculous.js'); +page_add_script (site_prefix () . '/js/jquery-1.3.2.min.js'); page_add_script (site_prefix () . '/js/prompt.js'); ?> \ No newline at end of file saf/lib/GUI/Prompt.php @@ -181,7 +181,7 @@ class Loader { if (is_string ($path)) { $this->paths['default'] = $path; } elseif (is_array ($path)) { - $this->paths['default'] = ereg_replace ('\\\\', '/', getcwd ()); + $this->paths['default'] = preg_replace ('|\\\\|', '/', getcwd ()); while (list ($n, $p) = each ($path)) { $this->paths[$n] = $p; } @@ -323,7 +323,7 @@ class Loader { $d->close (); return; } - if (ereg ('^\.+$', $file)) { + if (preg_match ('|^\.+$|', $file)) { continue; } elseif (($file == $package) && (@is_dir ($dir . '/' . $file))) { if ($load) { saf/lib/Loader/Loader.php @@ -310,7 +310,11 @@ class MailFormRule { return false; } } elseif ($this->type == 'email') { - if (! preg_match ("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $value)) { + if (strpos ($value, '.@') !== false) { + return false; + } elseif (preg_match ('/\.$/', $value)) { + return false; + } elseif (! preg_match ("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+\.([a-zA-Z0-9\._-]+)+$/" , $value)) { return false; } } elseif ($this->type == 'header') { @@ -414,7 +418,7 @@ class MailFormRule { return false; } } elseif ($this->type == 'email') { - if (preg_match ("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $value)) { + if (strpos ($value, '.@') === false && ! preg_match ('/\.$/', $value) && preg_match ("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+\.([a-zA-Z0-9\._-]+)+$/" , $value)) { return false; } } elseif ($this->type == 'header') { saf/lib/MailForm/Rule.php @@ -981,7 +981,7 @@ class SessionManager_Role { // Lives in inc/conf/auth/roles/${name}.php $w =& $form->addWidget ('text', 'name'); $w->alt = intl_get ('Name'); $w->addRule ('not empty', intl_get ('Role name must not be empty.')); - $w->addRule ('regex "^[-a-zA-Z0-9_]+$', intl_get ('Role same should only contains alphanumeric characters or underscores.')); + $w->addRule ('regex "^[-a-zA-Z0-9_]+$"', intl_get ('Role same should only contains alphanumeric characters or underscores.')); $w->setValue ($item); $w->extra = 'maxlength="48"'; saf/lib/Session/Manager.php @@ -1,3 +1,35 @@ alter table sitellite_news add column external char(128) not null after summary; alter table sitellite_news_sv add column external char(128) not null after summary; +CREATE TABLE `ui_comment` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(128) NOT NULL, + `email` varchar(128) NOT NULL, + `website` varchar(256) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `ip` varchar(15) NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`id`), + KEY `item_group` (`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_rating` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `rating` int(11) default NULL, + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +CREATE TABLE `ui_review` ( + `user` varchar(48) NOT NULL, + `item` varchar(128) NOT NULL, + `group` varchar(32) NOT NULL, + `comment` text NOT NULL, + `date` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `approved` tinyint(1) NOT NULL default '1', + PRIMARY KEY (`user`,`item`,`group`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; upgrade/5.0.2-5.0.3.sql 0e61be13e2599998f4a3f502743835020b44d7b5 f83fcfeeafd771ba4e29651e530e1f2068f0b073 John Luxford lux@www.dojolearning.lo http://github.com/lux/sitellite/commit/8be242ff5a0803ceba09750b7247ca0b355743c9 8be242ff5a0803ceba09750b7247ca0b355743c9 2009-10-13T11:13:52-07:00 2009-10-13T11:13:52-07:00 Merge branch 'master' of git@github.com:lux/sitellite c2738bc21b454cd4e68720aadc5e4ce73181a6ef John Luxford lux@www.dojolearning.lo