diff --git a/CODE-TODO.md b/CODE-TODO.md new file mode 100644 index 0000000..510ccc0 --- /dev/null +++ b/CODE-TODO.md @@ -0,0 +1,169 @@ +# To-Do + +## Almost Done + +[nothing assigned yet] + +## Eventually To Do - Short-Term/Long-Term + +* master hyperlink codeofconduct pages (from relative site to anarchistcode.com site) +* control terms/codeofcoduct/privacy pages by means of globals +* control terms/codeofcoduct/privacy sitemap listings by means of globals +* fix anarchistcode.com child entries for alternate record access +* complete list-title/sort-title distinction code +* hyperlink inspired sources in the code of conduct script +* detect files ending in the name "php.php" because of the basic inability of the Windows operating system to save, open, or update files, of any type +* fix css in terms/codeofconduct/privacy/etc pages for document width +* multilink privacy/codeofconduct/terms pages +* move suggestion config stuff to globals file +* move thumbs up/down functionality to top of pages, also, modularize +* make all common links, i.e., privacy, codeofconduct, search, home, about, terms, suggestions, etc., be configurable within globals +* make suggestions link in master linking globals-file-controlled +* fix the record count numbers in wordweight on the primary index page +* make an actual user-panel page +* have wordweight link to other pages based on keywords +* remove image::1 etc. junk from browseLikes action on sub-child records +* breadcrumb trail option: indicate full title/subtitle combo on primary entry +* move breadcrumb trails into a module +* always-include css/js php template file list +* integrate givenname/familyname to entries +* don't create 404 reports if the user logged in is admin +* actually finish up listTitle versus ListSortKey +* restyle the header box to float to top and be surrounded with kickass border thing (put the date in the header) +* put Authentication.php's salts into the globals file +* misspellings: float correct spelling over misspelled word +* full-text search, two fields, one with html stripped for search, the other without it stripped for storage +* utf8: store everything native without html entities +* text-error-detector: type-selectable, and let english-alt's be a type +* Have both english/misspelling language classes inherit the same parent class +* chronology: list number of changes +* detect all new DBAccess calls to guarantee globals-passing +* make a dummy globals file for github for clonefrom +* "subscribe to entry"'s changes +* backup all textbody changes +* show textbody changes logs +* show diff in updating entry +* detect bad text +* print words func for english/british, misspellings, wordweight dictionary, etc.. +* finish view/resolve/etc issues/errors +* search results for chapters: do not display text +* autopopulate URL field form SERVER field in issues/errors +* entry aka field +* admin: find host db's missing fields, etc. +* actual die() call on bad image source printing for the html-to-pdf php app +* pull handler.pm functionality for dictionaries into config func +* js file that detects and reports ISE's on non-resolved images +* generate the github-shareable clonefrom db file +* warroom: comment linkage +* actual default backup languages for css +* detect: entries w/ images and textbodies, but no Image::123 text +* swap left/right the images for multi-child textbody view +* randomized new-user password in Security/Password.php +* old-logs => password detector +* old-logs => password censoring +* display popular searches in index action of view +* separate view/index? +* smallify social media icons +* remove all "..._object"-named object vars. +* only copy essential files when setting up new system +* error/issue generator script +* move color settings to globals +* move all lists to globals +* have master-c.php use the global colors fully, compare revoltlib.com with any other domain's master-c.php +* scrollable/hidable "newest changes" list, with more than 10 entries +* scrollable/hidable "newest changes" page! (news.php) +* new domain protocol: add /image/ directory +* new domain protocol: build globals file +* edit link for completed changes on primary entry does not link correctly site.com/Site.com/edit, etc.. +* "newest additions" index * > skip if entry is primary domain +* image-floatover, show artist picture, as well, if possible +* autoredirect if "//" occurs within a url +* detect/fix/change-code for all 777 folders to be 755 +* password-deleting from logging data should be the duty of the logger, not the password management system +* github project/site: instagram scheduler +* "style:" detector within template/etc. code +* move all domain folders "blah.com" to a domains folder in root dir +* move ValidateOrm() in /scripts/ to Handler.php somehow +* move about.php images +* make all templates use the entrylinks module +* turn all JS scripts into php pages and merely render them as *.js, etc. +* a progress bar physically indicating current location in browsing +* a history.php page detailing all changes so far +* php, good-version check/verify +* plz fix: https://www.revoltlib.com/dbstatus.php?action=ShowTablesListSchemas +* display backup records in save +* detect .htaccess files in folders in which it does not belong +* test record backups for brand-new records +* delete(), in modify.php, handle backups +* view.php, link to history.php, if necessary, etc. +* clone entry w/ entry children between db's (through transfer! * give transfer a clone option) +* clone child records from record to record option +* list boolean operator table in search.php page +* utf-8 diamonds in fulltext search results +* git.php url, "Oh, so, how to git to this project" +* store/display text without any html entities at all +* option to detect/correct alphabetizing the list of "words" at /classes/Languages/words/* +* detect texts over x-length that should be broken up +* if user ever logs in on http, save a cookie that makes them always redirect to https +* fix spacing on the siblings-navigation panel +* detect commas in entry CODE field +* entry code generation, preserve dashes that occur without spaces, i.e., "self-employment" vs "chapter 1 - self employment"; +* detect entry titles containing zero-padded numbers, i.e. "Chapter 01" +* make all comment links be "no-follow" +* mouseover on detectbadtext's errors, indicating the correct-theorized spelling +* README.MD in ~ALL~ folders! +* detect no-longer matching keyword/tag-for-entry's text +* make "birth day", "death day", "publication" be preselectable options for publication title +* detector for broken image records wherein some size field is set to 0 +* annual reminder to delete and refresh all api keys/passwords +* modify.php: "about to leave this page" warning on pages if there have been changes to any fields +* cut words like "a", "an", "the" from code-generation +* make a common clonefrom.com/images/*some-doc-type-image-that-is-general*/ folder +* colorize icons for terms/privacy/codeofconduct pages + +# Done + +## Version 1.01 + +* intensive spellchecker, detect odd caps in text (i.e., thIs) +* common misspelling spellchecker +* complete anarchistcode.com +* change google API keys (oops, sorry for leaking that on github, sigh) +* changing filename of an image doesn't move the image locations of Image.IconFileName and Image.StandardFileName +* disallow %'s in filenames when uploading images +* make permalink url's script-intelligent, i.e., site.com/?id=123 goes to Entry 123's view.php url, but now site.com/modify.php?id=123&action=Edit will redirect to Entry 123's modify.php?action=Edit URL +* detect "logged-in-status" on non-https pages, and properly redirect to https pages +* have all scripts' templates use the modularized entry-controls.php +* login.php: allow google use +* logout.php: allow google use +* login.php: redirect to url option +* logout.php: redirect to url option +* fix display of small-than-icon size images at revoltlib, etc,. templates +* list title auto-generation, ucfirst after all is done +* zap all passwords or password-passed args from bash files +* make entrycontrols module accept that=>this as args in constructor and not in function calls +* module-ize breadcrumb trails +* module-ize login/logout info +* add breadcrumbs/login info to suggest.php +* remove login/logout info from bottom of all templates +* fixup login info for classes/Language/Dictionary.php +* fix bad format-icon images on terms/codeofconduct/etc pages +* modularize the alternate format icons/etc. +* miniaturize bad format-icon images on terms/codeofconduct/etc pages +* export user data - fix format icons +* handle alternate formats for terms/codeofconduct/privacy/etc pages +* actually move user-login info to top of page plz +* fix privacy policy/code of conduct/terms pages to have proper audio-translators +* finish terms/codeofconduct/privacy/etc pages + +## Version 1.00 + +* make format icons tiny, but have them resize to large when hover'd over +* add server, get, post var's to internalserverissue-logging +* issue logging on 404 +* actually move the password to the globals file +* test robots.txt regexes +* actually move the brand new user default password +* move google api keys to globals +* long-term, actual test robots.txt regexes diagnostic tool +* show artist/uploader/etc. info for floatover of main index image \ No newline at end of file diff --git a/app/php-html-to-pdf/php-html-to-pdf.php b/app/php-html-to-pdf/php-html-to-pdf.php new file mode 100644 index 0000000..740b738 --- /dev/null +++ b/app/php-html-to-pdf/php-html-to-pdf.php @@ -0,0 +1,671 @@ +'HoldOffHunger', + 'Title'=>'Privacy Policy', + ]); + + WriteHTML([ + 'html'=>'

I can say hello in 日本人!

こんにちは!

', + 'language'=>'ja', + ]); + + Chinese Example + -------------------------------------- + + require('../app/fpdf-write-html/fpdf-write-html.php'); + + $pdf_object = new HTMLtoPDF([ + 'Author'=>'HoldOffHunger', + 'Title'=>'Privacy Policy', + ]); + + WriteHTML([ + 'html'=>'

I can say hello in 汉语!

你好!

', + 'language'=>'zh', + ]); + + Englsh Example + -------------------------------------- + + require('../app/fpdf-write-html/fpdf-write-html.php'); + + $pdf_object = new HTMLtoPDF([ + 'Author'=>'HoldOffHunger', + 'Title'=>'Privacy Policy', + ]); + + WriteHTML([ + 'html'=>'

I can say hello in English!

Hello!

', + 'language'=>'en', + ]); + +*/ + + require('../app/tfpdf/tfpdf.php'); + + class HTMLtoPDF extends tFPDF { + protected $HREF; + + // Constructor + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function __construct($args) { + $this->constructParent($args); + $this->setMetaData($args); + $this->setInitialState(); + + return $this; + } + + function constructParent($args) { + if($args['orientation']) { + $orientation = $args['orientation']; + } else { + $orientation = $this->getDefaultOrientation(); + } + + if($args['unit']) { + $unit = $args['unit']; + } else { + $unit = $this->getDefaultUnit(); + } + + if($args['format']) { + $format = $args['format']; + } else { + $format = $this->getDefaultFormat(); + } + parent::__construct($orientation, $unit, $format); + + return TRUE; + } + + function setMetaData($args) { + if($args['Title']) { + $this->SetTitle($args['Title'], TRUE); + } + + if($args['Author']) { + $this->SetAuthor($args['Author'], TRUE); + } + + if($args['Subject']) { + $this->SetSubject($args['Subject'], TRUE); + } + + if($args['Keywords']) { + $this->SetKeywords($args['Keywords'], TRUE); + } + + if($args['Creator']) { + $this->SetCreator($args['Creator'], TRUE); + } + + return TRUE; + } + + function setInitialState() { + $this->HREF = ''; + $this->issetcolor = FALSE; + + return TRUE; + } + + function getSupportedFontsList() { + if($this->font_list) { + return $this->font_list; + } + + $supported_fonts = $this->getSupportedFonts(); + + $supported_fonts_list = []; + + foreach($supported_fonts as $supported_font) { + $supported_fonts_list[$supported_font] = TRUE; + } + + return $this->font_list = $supported_fonts_list; + } + + function getSupportedFonts() { + return [ + 'arial', + 'times', + 'courier', + 'helvetica', + 'symbol', + ]; + } + + // Main Function to Call + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function WriteHTML($args) { + $html = $args['html']; + $language = $args['language']; + + $this->setHTMLFonts(['language'=>$language]); + $this->setStartingFont(); + $this->setStartingMargins(); + + $this->WriteHTMLContent(['html'=>$html]); + + return TRUE; + } + + // Prepare the Data + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function WriteHTMLContent($args) { + $html = $args['html']; + + $html = $this->cleanseInput(['input'=>$html]); + + $dom = $this->buildDom(['html'=>$html]); + + return $this->parseDom([dom=>$dom]); + } + + function cleanseInput($args) { + $input = $args['input']; + + $input = strip_tags($input,$this->getSupportedHTMLTags()); + $input = preg_replace('/[\r\n]+/', ' ', $input); + + return $input; + } + + function buildDom($args) { + $html = $args['html']; + + $dom = preg_split('/<(.*)>/U', $html, -1, PREG_SPLIT_DELIM_CAPTURE); + + return $dom; + } + + function setHTMLFonts($args) { + $language = $args['language']; + + switch($language) { + case 'zh': + $this->AddFont('chinese','','chinese.ttf',true); + break; + + case 'ja': + $this->AddFont('japanese','','japanese.ttf',true); + break; + } + + $this->AddFont('DejaVu','','DejaVuSansCondensed.ttf',true); + $this->AddFont('DejaVu','Bold','DejaVuSans-Bold.ttf',true); + $this->AddFont('DejaVu','Italic','DejaVuSans-Oblique.ttf',true); + + $this->base_font = $this->getBaseFont(['language'=>$language]); + $this->bold_font = $this->getBoldFont(['language'=>$language]); + $this->italics_font = $this->getItalicsFont(['language'=>$language]); + + return TRUE; + } + + function setStartingFont() { + $this->SetFont($this->base_font, '', 14); + $this->line_height = 14; + + return TRUE; + } + + function setStartingMargins() { + $this->AddPage(); + $this->SetTopMargin(10); + $this->SetLeftMargin(10); + $this->SetRightMargin(10); + + return TRUE; + } + + function getSupportedHTMLTags() { + $supported_tags = ''; + + foreach($this->getSupportedHTMLTagsList() as $tag) { + $supported_tags .= '<' . $tag . '>'; + } + + return $supported_tags; + } + + // Parse the Data + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function parseDom($args) { + $dom = $args['dom']; + + $is_text_content = TRUE; + + foreach($dom as $i => $dom_piece) { + if($is_text_content) { + $this->parseDom_handleContent([ + 'text'=>$dom_piece, + ]); + } else { + $this->parseDom_handleTag([ + 'tag'=>$dom_piece, + ]); + } + $is_text_content = !$is_text_content; + } + return TRUE; + } + + function parseDom_handleContent($args) { + $text = $args['text']; + + if($this->HREF) { + $this->parseDom_handleContent_link(['text'=>$text]); + } else { + $this->parseDom_handleContent_text(['text'=>$text]); + } + + return TRUE; + } + + function parseDom_handleContent_text($args) { + $text = $args['text']; + + if($this->li) { + $text = '• ' . $text; + $this->li = FALSE; + } + + $this->Write($this->line_height,stripslashes($this->adjustHTMLEntities($text))); + + return TRUE; + } + + function parseDom_handleContent_link($args) { + $text = $args['text']; + + $URL = $this->HREF; + $this->SetTextColor(0,0,255); + $this->underline = TRUE; + $this->Write($this->line_height,$text,$URL); + $this->underline = FALSE; + $this->SetTextColor(0); + $this->HREF = FALSE; + + return TRUE; + } + + function parseDom_handleTag($args) { + $tag = $args['tag']; + + if($tag[0] == '/') { + $this->parseDom_handleTag_closingTag($args); + } else { + $this->parseDom_handleTag_openingTag($args); + } + + return TRUE; + } + + function parseDom_handleTag_closingTag($args) { + $tag = $args['tag']; + $this->CloseTag(strtoupper(substr($tag,1))); + + return TRUE; + } + + function parseDom_handleTag_openingTag($args) { + $tag = $args['tag']; + + $tag_pieces = explode(' ',$tag); + $tag = strtoupper(array_shift($tag_pieces)); + + $attributes = $this->getAttributesFromTag(['tag_pieces'=>$tag_pieces]); + $this->OpenTag($tag, $attributes); + + return TRUE; + } + + function getAttributesFromTag($args) { + $tag_pieces = $args['tag_pieces']; + + $attributes = []; + + foreach($tag_pieces as $tag_piece) { + if(preg_match('/([^=]*)=["\']?([^"\']*)/', $tag_piece, $tag_piece_values)) { + $attributes[strtoupper($tag_piece_values[1])] = $tag_piece_values[2]; + } + } + + return $attributes; + } + + // Apply Tag Stylings to the Data + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function OpenTag($tag, $attr) { + $tag = $this->swapTag(['tag'=>$tag]); + + $line_height_adjust = 0.7; + $font_height_adjust = 0.9; + + switch($tag) { + case 'B': + $this->SetFont($this->bold_font); + break; + + case 'I': + $this->SetFont($this->italics_font); + break; + + case 'U': + $this->underline = true; + break; + + case 'A': + if(!$attr['NAME']) { + $this->HREF = $attr['HREF']; + } + break; + + case 'IMG': + if(isset($attr['SRC']) && (isset($attr['WIDTH']) || isset($attr['HEIGHT']))) { + if(!isset($attr['WIDTH'])) { + $attr['WIDTH'] = 0; + } + + if(!isset($attr['HEIGHT'])) { + $attr['HEIGHT'] = 0; + $this->Image($attr['SRC'], $this->GetX(), $this->GetY(), $this->convertPixelToMM(['pixels'=>$attr['WIDTH']]), $this->convertPixelToMM(['pixels'=>$attr['HEIGHT']])); + } + } + $this->Ln(20); + break; + + case 'FONT': + $font_list = $this->getSupportedFontsList(); + if (isset($attr['COLOR']) && $attr['COLOR']!='') { + $colors = $this->convertHTMLColorToNumeric(['color'=>$attr['COLOR']]); + $this->SetTextColor($colors['red'], $colors['green'], $colors['blue']); + } + if (isset($attr['FACE']) && $font_list[strtolower($attr['FACE'])]) { + $this->SetFont(strtolower($attr['FACE'])); + } + break; + + case 'LI': + $this->li = true; + break; + + case 'P': + $this->SetFont($this->base_font, '', 14 * $font_height_adjust); + $this->line_height = 8 * $line_height_adjust; + break; + + case 'UL': + case 'BLOCKQUOTE': + $this->SetLeftMargin(25); + $this->SetRightMargin(25); + break; + + case 'H1': + $this->SetFont($this->bold_font, '', 40 * $font_height_adjust); + $this->line_height = 20 * $line_height_adjust; + break; + + case 'H2': + $this->SetFont($this->base_font, '', 30 * $font_height_adjust); + $this->line_height = 15 * $line_height_adjust; + break; + + case 'H3': + $this->SetFont($this->base_font, '', 25 * $font_height_adjust); + $this->line_height = 12 * $line_height_adjust; + break; + + case 'H4': + $this->SetFont($this->base_font, '', 20 * $font_height_adjust); + $this->line_height = 10 * $line_height_adjust; + break; + + case 'H5': + $this->SetFont($this->base_font, '', 18 * $font_height_adjust); + $this->line_height = 9 * $line_height_adjust; + break; + + case 'H6': + $this->SetFont($this->base_font, '', 16 * $font_height_adjust); + $this->line_height = 8 * $line_height_adjust; + break; + } + } + + function CloseTag($tag) { + $tag = $this->swapTag(['tag'=>$tag]); + switch($tag) { + case 'B': + $this->SetFont($this->base_font); + break; + + case 'I': + $this->SetFont($this->base_font); + break; + + case 'U': + $this->underline = false; + break; + + case 'FONT': + $this->SetTextColor(0); + $this->SetFont($this->base_font); + break; + + case 'UL': + case 'BLOCKQUOTE': + $this->SetLeftMargin(10); + $this->SetRightMargin(10); + break; + } + + switch($tag) { + case 'BLOCKQUOTE': + case 'P': + case 'H1': + case 'H2': + case 'H3': + case 'H4': + case 'H5': + case 'H6': + case 'LI': + $this->Ln($this->line_height); + break; + } + + return true; + } + + // Defaults + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function getSupportedHTMLTagsList() { + return [ + 'a', + 'b', + 'blockquote', + 'br', + 'em', + 'font', + 'h1', + 'h2', + 'h3', + 'h4', + 'h5', + 'h6', + 'i', + 'img', + 'li', + 'p', + 'strong', + 'u', + 'ul', + ]; + } + + function getDefaultOrientation() { + return 'P'; + } + + function getDefaultUnit() { + return 'mm'; + } + + function getDefaultFormat() { + return 'A4'; + } + + public function getBaseFont($args) { + $language = $args['language']; + + switch($language) { + default: + case 'en': + $font = 'dejavu'; + break; + + case 'ja': + $font = 'japanese'; + break; + + case 'zh': + $font = 'chinese'; + break; + } + + return $font; + } + + public function getBoldFont($args) { + $language = $args['language']; + + switch($language) { + default: + case 'en': + $font = 'dejavu b'; + break; + + case 'ja': + $font = 'japanese'; + break; + + case 'zh': + $font = 'chinese'; + break; + } + + return $font; + } + + public function getItalicsFont($args) { + $language = $args['language']; + + switch($language) { + default: + case 'en': + $font = 'dejavuITALIC'; + break; + + case 'ja': + $font = 'japanese'; + break; + + case 'zh': + $font = 'chinese'; + break; + } + + return $font; + } + + function swapTag($args) { + $tag = $args['tag']; + + switch($tag){ + case 'STRONG': + $tag = 'B'; + break; + + case 'EM': + $tag = 'I'; + break; + } + + return $tag; + } + + // Utilities + // ----------------------------------------------------- + // ----------------------------------------------------- + // ----------------------------------------------------- + + function convertPixelToMM($args) { + $pixels = $args['pixels']; + + return $pixels * $this->pixelToMMRatio(); + } + + function pixelToMMRatio() { + if($this->pixeltommratio) { + return $this->pixeltommratio; + } + + return $this->pixeltommratio = 25.4/72; + } + + function convertHTMLColorToNumeric($args) { + $color = $args['color']; + + $colors = str_split($color, 2); + + $table_colors = [ + 'red'=>$colors[0], + 'green'=>$colors[1], + 'blue'=>$colors[2], + ]; + + return $table_colors; + } + + function adjustHTMLEntities($html) { + $trans = get_html_translation_table(HTML_ENTITIES, ENT_COMPAT, 'UTF-8'); + $trans = array_flip($trans); + $result = strtr($html, $trans); + + return $result; + } + } +?> \ No newline at end of file diff --git a/app/tfpdf/font/chinese.php b/app/tfpdf/font/chinese.php new file mode 100644 index 0000000..fcdb328 --- /dev/null +++ b/app/tfpdf/font/chinese.php @@ -0,0 +1,26 @@ +880,'Descent'=>-120,'CapHeight'=>710,'Flags'=>32,'FontBBox'=>'[-40 -187 759 884]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>500); +$up = -75; +$ut = 50; +$cw = array( + chr(0)=>500,chr(1)=>500,chr(2)=>500,chr(3)=>500,chr(4)=>500,chr(5)=>500,chr(6)=>500,chr(7)=>500,chr(8)=>500,chr(9)=>500,chr(10)=>500,chr(11)=>500,chr(12)=>500,chr(13)=>500,chr(14)=>500,chr(15)=>500,chr(16)=>500,chr(17)=>500,chr(18)=>500,chr(19)=>500,chr(20)=>500,chr(21)=>500, + chr(22)=>500,chr(23)=>500,chr(24)=>500,chr(25)=>500,chr(26)=>500,chr(27)=>500,chr(28)=>500,chr(29)=>500,chr(30)=>500,chr(31)=>500,' '=>180,'!'=>196,'"'=>217,'#'=>591,'$'=>496,'%'=>513,'&'=>489,'\''=>107,'('=>306,')'=>307,'*'=>414,'+'=>638, + ','=>198,'-'=>325,'.'=>181,'/'=>332,'0'=>508,'1'=>264,'2'=>507,'3'=>498,'4'=>499,'5'=>508,'6'=>508,'7'=>384,'8'=>509,'9'=>508,':'=>181,';'=>238,'<'=>556,'='=>638,'>'=>557,'?'=>343,'@'=>681,'A'=>531, + 'B'=>495,'C'=>496,'D'=>496,'E'=>485,'F'=>485,'G'=>496,'H'=>496,'I'=>272,'J'=>411,'K'=>486,'L'=>485,'M'=>617,'N'=>505,'O'=>496,'P'=>486,'Q'=>494,'R'=>485,'S'=>496,'T'=>376,'U'=>496,'V'=>471,'W'=>577, + 'X'=>514,'Y'=>429,'Z'=>497,'['=>285,'\\'=>310,']'=>285,'^'=>531,'_'=>510,'`'=>132,'a'=>438,'b'=>425,'c'=>405,'d'=>425,'e'=>425,'f'=>303,'g'=>436,'h'=>435,'i'=>212,'j'=>210,'k'=>363,'l'=>190,'m'=>592, + 'n'=>447,'o'=>427,'p'=>435,'q'=>435,'r'=>230,'s'=>426,'t'=>340,'u'=>446,'v'=>372,'w'=>604,'x'=>357,'y'=>416,'z'=>384,'{'=>271,'|'=>194,'}'=>273,'~'=>429,chr(127)=>500,chr(128)=>500,chr(129)=>500,chr(130)=>500,chr(131)=>500, + chr(132)=>500,chr(133)=>500,chr(134)=>500,chr(135)=>500,chr(136)=>500,chr(137)=>500,chr(138)=>500,chr(139)=>500,chr(140)=>500,chr(141)=>500,chr(142)=>500,chr(143)=>500,chr(144)=>500,chr(145)=>500,chr(146)=>500,chr(147)=>500,chr(148)=>500,chr(149)=>500,chr(150)=>500,chr(151)=>500,chr(152)=>500,chr(153)=>500, + chr(154)=>500,chr(155)=>500,chr(156)=>500,chr(157)=>500,chr(158)=>500,chr(159)=>500,chr(160)=>180,chr(161)=>500,chr(162)=>500,chr(163)=>500,chr(164)=>523,chr(165)=>387,chr(166)=>500,chr(167)=>500,chr(168)=>500,chr(169)=>610,chr(170)=>500,chr(171)=>500,chr(172)=>500,chr(173)=>500,chr(174)=>500,chr(175)=>500, + chr(176)=>231,chr(177)=>604,chr(178)=>500,chr(179)=>500,chr(180)=>500,chr(181)=>765,chr(182)=>500,chr(183)=>500,chr(184)=>500,chr(185)=>500,chr(186)=>500,chr(187)=>500,chr(188)=>500,chr(189)=>500,chr(190)=>500,chr(191)=>500,chr(192)=>500,chr(193)=>500,chr(194)=>500,chr(195)=>500,chr(196)=>500,chr(197)=>500, + chr(198)=>500,chr(199)=>500,chr(200)=>500,chr(201)=>500,chr(202)=>500,chr(203)=>500,chr(204)=>500,chr(205)=>500,chr(206)=>500,chr(207)=>500,chr(208)=>500,chr(209)=>500,chr(210)=>500,chr(211)=>500,chr(212)=>500,chr(213)=>500,chr(214)=>500,chr(215)=>500,chr(216)=>500,chr(217)=>500,chr(218)=>500,chr(219)=>500, + chr(220)=>500,chr(221)=>500,chr(222)=>500,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>500,chr(231)=>500,chr(232)=>500,chr(233)=>500,chr(234)=>500,chr(235)=>500,chr(236)=>500,chr(237)=>500,chr(238)=>500,chr(239)=>500,chr(240)=>500,chr(241)=>500, + chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>500,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500); +$enc = 'ISO-8859-16'; +$diff = '128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 161 /Aogonek /aogonek /Lslash /Euro /quotedblbase /Scaron 168 /scaron 170 /Scommaaccent 172 /Zacute 174 /zacute /Zdotaccent 178 /Ccaron /lslash /Zcaron /quotedblright 184 /zcaron /ccaron /scommaaccent 188 /OE /oe /Ydieresis /zdotaccent 195 /Abreve 197 /Cacute 208 /Dcroat /Nacute 213 /Ohungarumlaut 215 /Sacute /Uhungarumlaut 221 /Eogonek /Tcommaaccent 227 /abreve 229 /cacute 240 /dcroat /nacute 245 /ohungarumlaut 247 /sacute /uhungarumlaut 253 /eogonek /tcommaaccent'; +$uv = array(0=>array(0,161),161=>array(260,2),163=>321,164=>8364,165=>8222,166=>352,167=>167,168=>353,169=>169,170=>536,171=>171,172=>377,173=>173,174=>array(378,2),176=>array(176,2),178=>268,179=>322,180=>381,181=>8221,182=>array(182,2),184=>382,185=>269,186=>537,187=>187,188=>array(338,2),190=>376,191=>380,192=>array(192,3),195=>258,196=>196,197=>262,198=>array(198,10),208=>272,209=>323,210=>array(210,3),213=>336,214=>214,215=>346,216=>368,217=>array(217,4),221=>280,222=>538,223=>array(223,4),227=>259,228=>228,229=>263,230=>array(230,10),240=>273,241=>324,242=>array(242,3),245=>337,246=>246,247=>347,248=>369,249=>array(249,4),253=>281,254=>539,255=>255); +$file = 'Chinese_ZCOOLQingKeHuangYou-Regular.z'; +$originalsize = 22912; +$subsetted = true; +?> diff --git a/app/tfpdf/font/chinese.z b/app/tfpdf/font/chinese.z new file mode 100644 index 0000000..df06864 Binary files /dev/null and b/app/tfpdf/font/chinese.z differ diff --git a/app/tfpdf/font/japanese.php b/app/tfpdf/font/japanese.php new file mode 100644 index 0000000..2df06cc --- /dev/null +++ b/app/tfpdf/font/japanese.php @@ -0,0 +1,26 @@ +860,'Descent'=>-140,'CapHeight'=>860,'Flags'=>32,'FontBBox'=>'[-979 -343 1396 1075]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>363); +$up = -125; +$ut = 50; +$cw = array( + chr(0)=>363,chr(1)=>363,chr(2)=>363,chr(3)=>363,chr(4)=>363,chr(5)=>363,chr(6)=>363,chr(7)=>363,chr(8)=>363,chr(9)=>363,chr(10)=>363,chr(11)=>363,chr(12)=>363,chr(13)=>363,chr(14)=>363,chr(15)=>363,chr(16)=>363,chr(17)=>363,chr(18)=>363,chr(19)=>363,chr(20)=>363,chr(21)=>363, + chr(22)=>363,chr(23)=>363,chr(24)=>363,chr(25)=>363,chr(26)=>363,chr(27)=>363,chr(28)=>363,chr(29)=>363,chr(30)=>363,chr(31)=>363,' '=>270,'!'=>321,'"'=>396,'#'=>678,'$'=>564,'%'=>819,'&'=>688,'\''=>233,'('=>362,')'=>362,'*'=>511,'+'=>733, + ','=>277,'-'=>466,'.'=>283,'/'=>479,'0'=>619,'1'=>619,'2'=>619,'3'=>619,'4'=>619,'5'=>619,'6'=>619,'7'=>619,'8'=>619,'9'=>619,':'=>363,';'=>361,'<'=>667,'='=>754,'>'=>667,'?'=>622,'@'=>823,'A'=>639, + 'B'=>598,'C'=>612,'D'=>657,'E'=>587,'F'=>571,'G'=>687,'H'=>676,'I'=>315,'J'=>528,'K'=>586,'L'=>581,'M'=>815,'N'=>686,'O'=>714,'P'=>600,'Q'=>722,'R'=>605,'S'=>553,'T'=>634,'U'=>655,'V'=>639,'W'=>863, + 'X'=>609,'Y'=>609,'Z'=>615,'['=>470,'\\'=>479,']'=>470,'^'=>602,'_'=>562,'`'=>237,'a'=>533,'b'=>577,'c'=>492,'d'=>577,'e'=>523,'f'=>508,'g'=>563,'h'=>569,'i'=>310,'j'=>354,'k'=>522,'l'=>310,'m'=>784, + 'n'=>564,'o'=>556,'p'=>573,'q'=>573,'r'=>449,'s'=>496,'t'=>502,'u'=>560,'v'=>522,'w'=>770,'x'=>504,'y'=>521,'z'=>535,'{'=>514,'|'=>344,'}'=>514,'~'=>674,chr(127)=>363,chr(128)=>363,chr(129)=>363,chr(130)=>363,chr(131)=>363, + chr(132)=>363,chr(133)=>363,chr(134)=>363,chr(135)=>363,chr(136)=>363,chr(137)=>363,chr(138)=>363,chr(139)=>363,chr(140)=>363,chr(141)=>363,chr(142)=>363,chr(143)=>363,chr(144)=>363,chr(145)=>363,chr(146)=>363,chr(147)=>363,chr(148)=>363,chr(149)=>363,chr(150)=>363,chr(151)=>363,chr(152)=>363,chr(153)=>363, + chr(154)=>363,chr(155)=>363,chr(156)=>363,chr(157)=>363,chr(158)=>363,chr(159)=>363,chr(160)=>270,chr(161)=>651,chr(162)=>533,chr(163)=>642,chr(164)=>684,chr(165)=>448,chr(166)=>553,chr(167)=>596,chr(168)=>490,chr(169)=>815,chr(170)=>553,chr(171)=>720,chr(172)=>615,chr(173)=>466,chr(174)=>535,chr(175)=>615, + chr(176)=>396,chr(177)=>754,chr(178)=>612,chr(179)=>437,chr(180)=>615,chr(181)=>434,chr(182)=>705,chr(183)=>283,chr(184)=>535,chr(185)=>492,chr(186)=>496,chr(187)=>720,chr(188)=>835,chr(189)=>917,chr(190)=>609,chr(191)=>535,chr(192)=>639,chr(193)=>639,chr(194)=>639,chr(195)=>639,chr(196)=>639,chr(197)=>612, + chr(198)=>796,chr(199)=>612,chr(200)=>587,chr(201)=>587,chr(202)=>587,chr(203)=>587,chr(204)=>289,chr(205)=>289,chr(206)=>267,chr(207)=>317,chr(208)=>725,chr(209)=>686,chr(210)=>714,chr(211)=>714,chr(212)=>714,chr(213)=>714,chr(214)=>714,chr(215)=>553,chr(216)=>655,chr(217)=>655,chr(218)=>655,chr(219)=>655, + chr(220)=>655,chr(221)=>587,chr(222)=>634,chr(223)=>594,chr(224)=>533,chr(225)=>533,chr(226)=>533,chr(227)=>533,chr(228)=>533,chr(229)=>492,chr(230)=>863,chr(231)=>492,chr(232)=>523,chr(233)=>523,chr(234)=>523,chr(235)=>523,chr(236)=>293,chr(237)=>293,chr(238)=>259,chr(239)=>308,chr(240)=>649,chr(241)=>564, + chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>555,chr(246)=>556,chr(247)=>496,chr(248)=>533,chr(249)=>560,chr(250)=>560,chr(251)=>560,chr(252)=>560,chr(253)=>523,chr(254)=>502,chr(255)=>521); +$enc = 'ISO-8859-16'; +$diff = '128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 161 /Aogonek /aogonek /Lslash /Euro /quotedblbase /Scaron 168 /scaron 170 /Scommaaccent 172 /Zacute 174 /zacute /Zdotaccent 178 /Ccaron /lslash /Zcaron /quotedblright 184 /zcaron /ccaron /scommaaccent 188 /OE /oe /Ydieresis /zdotaccent 195 /Abreve 197 /Cacute 208 /Dcroat /Nacute 213 /Ohungarumlaut 215 /Sacute /Uhungarumlaut 221 /Eogonek /Tcommaaccent 227 /abreve 229 /cacute 240 /dcroat /nacute 245 /ohungarumlaut 247 /sacute /uhungarumlaut 253 /eogonek /tcommaaccent'; +$uv = array(0=>array(0,161),161=>array(260,2),163=>321,164=>8364,165=>8222,166=>352,167=>167,168=>353,169=>169,170=>536,171=>171,172=>377,173=>173,174=>array(378,2),176=>array(176,2),178=>268,179=>322,180=>381,181=>8221,182=>array(182,2),184=>382,185=>269,186=>537,187=>187,188=>array(338,2),190=>376,191=>380,192=>array(192,3),195=>258,196=>196,197=>262,198=>array(198,10),208=>272,209=>323,210=>array(210,3),213=>336,214=>214,215=>346,216=>368,217=>array(217,4),221=>280,222=>538,223=>array(223,4),227=>259,228=>228,229=>263,230=>array(230,10),240=>273,241=>324,242=>array(242,3),245=>337,246=>246,247=>347,248=>369,249=>array(249,4),253=>281,254=>539,255=>255); +$file = 'japanese.z'; +$originalsize = 32060; +$subsetted = true; +?> diff --git a/app/tfpdf/font/japanese.z b/app/tfpdf/font/japanese.z new file mode 100644 index 0000000..db4941b Binary files /dev/null and b/app/tfpdf/font/japanese.z differ diff --git a/app/tfpdf/font/unifont/chinese.ttf b/app/tfpdf/font/unifont/chinese.ttf new file mode 100644 index 0000000..ff84a88 Binary files /dev/null and b/app/tfpdf/font/unifont/chinese.ttf differ diff --git a/app/tfpdf/font/unifont/japanese.ttf b/app/tfpdf/font/unifont/japanese.ttf new file mode 100644 index 0000000..7f57273 Binary files /dev/null and b/app/tfpdf/font/unifont/japanese.ttf differ diff --git a/bash/startmysql b/bash/startmysql index a7c28b6..59e169d 100644 --- a/bash/startmysql +++ b/bash/startmysql @@ -3,4 +3,4 @@ # This file/command may not be called 'mysql', since that is the command # reserved for the actual MySQL server. -mysql -u ouruprising -pYOURPASSWORDHERE -h mysql.ouruprising.com +mysql -h mysql.ouruprising.com diff --git a/classes/API/Google.php b/classes/API/Google.php index 2aff7ca..908c8f8 100644 --- a/classes/API/Google.php +++ b/classes/API/Google.php @@ -10,6 +10,7 @@ public function __construct($args) { $this->db_access_object = $args['dbaccessobject']; $this->authentication_object = $args['authenticationobject']; $this->globals = $args['globals']; + $this->cookie = $args['cookie']; if(count($this->globals->apidata) < 1) { return FALSE; @@ -39,7 +40,7 @@ public function AuthenticateOrDisauthenticateWithGoogle($args) { $email_address = $payload['email']; $user_record_args = [ - 'type'=>User, + 'type'=>'User', 'definition'=>[ 'EmailAddress'=>$email_address, ], @@ -55,12 +56,12 @@ public function AuthenticateOrDisauthenticateWithGoogle($args) { if($user_account[0] && $user_account[0]['id']) { $this->authentication_object->user_account = $user_account; - $this->authentication_object->Login_Successful([useraccount=>$user_account]); + $this->authentication_object->Login_Successful(['useraccount'=>$user_account]); $results['newuser'] = 0; } else { $hashed_password = hash('sha256', $this->globals->passwordseed); $user_record_args = [ - 'type'=>User, + 'type'=>'User', 'definition'=>[ 'EmailAddress'=>$email_address, 'RAW'=>[ @@ -75,18 +76,22 @@ public function AuthenticateOrDisauthenticateWithGoogle($args) { $user_creation_results = $this->db_access_object->CreateRecord($user_record_args); $this->authentication_object->user_account = [$user_creation_results]; - $this->authentication_object->Login_Successful([useraccount=>[$user_account]]); + $this->authentication_object->Login_Successful(['useraccount'=>[$user_account]]); $results['newuser'] = 1; } $this->authentication_object->CheckCurrentAuthentication(); $results['action'] = 'login'; + + $this->handleLoginCookie(); } } if($logout) { $this->Logout(); $results['action'] = 'logout'; + + $this->handleLogoutCookie(); } return $results; @@ -95,6 +100,22 @@ public function AuthenticateOrDisauthenticateWithGoogle($args) { public function Logout() { return $this->authentication_object->Logout(); } + + public function handleLoginCookie() { + return $this->cookie->SetCookie([ + 'key'=>'loggedin', + 'value'=>TRUE, + 'permanent'=>TRUE, + ]); + } + + public function handleLogoutCookie() { + return $this->cookie->SetCookie([ + 'key'=>'loggedin', + 'value'=>FALSE, + 'permanent'=>TRUE, + ]); + } } ?> \ No newline at end of file diff --git a/classes/Database/ORMSearch.php b/classes/Database/ORMSearch.php index 2b25598..e41055f 100644 --- a/classes/Database/ORMSearch.php +++ b/classes/Database/ORMSearch.php @@ -24,6 +24,11 @@ public function Search($args) { $search_terms = $args['searchterms']; $start_index = $args['startindex']; $end_index = $args['endindex']; + $mode = $args['mode']; + + if(!$mode) { + $mode = 'NATURAL LANGUAGE'; + } $sql = 'SELECT '; @@ -46,24 +51,34 @@ public function Search($args) { $sql .= 'Entry.OriginalCreationDate as Entry_OriginalCreationDate, '; $sql .= 'Entry.LastModificationDate as Entry_LastModificationDate, '; */ - $sql .= 'MATCH (TextBody.Text) AGAINST (? IN NATURAL LANGUAGE MODE) AS score '; + $sql .= 'MATCH (TextBody.Text) AGAINST (? IN ' . $mode . ' MODE) AS score '; $sql .= 'FROM TextBody '; $sql .= 'JOIN Entry ON Entry.id = TextBody.Entryid '; + + $where = $args['where']; + + if($where) { + $sql .= 'WHERE ' . $where; + } + $sql .= 'HAVING score > 0 '; $sql .= 'ORDER BY score DESC '; - if($start_index && $end_index) - { + if($start_index && $end_index) { $sql .= 'LIMIT ' . ($start_index - 1) . ',' . ($end_index) ; } + if(count($search_terms) > 1) { + $search_terms = [implode(' ', $search_terms)]; + } + $sql .= ';'; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'s', - recordvalues=>$search_terms, + 'query'=>$sql, + 'sqlbindstring'=>'s', + 'recordvalues'=>$search_terms, ]; $codes = $this->dbaccessobject->FillArraysFromDB($fill_arrays_from_db_args); @@ -83,9 +98,9 @@ public function SearchResultsCount($args) { $sql .= ';'; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'s', - recordvalues=>[$search_term], + 'query'=>$sql, + 'sqlbindstring'=>'s', + 'recordvalues'=>[$search_term], ]; $results = $this->dbaccessobject->FillArraysFromDB($fill_arrays_from_db_args); diff --git a/classes/Development/Version.php b/classes/Development/Version.php index f839bae..2253a19 100644 --- a/classes/Development/Version.php +++ b/classes/Development/Version.php @@ -1,41 +1,33 @@ GetSoftwareName() . ' (' . $this->GetSoftwareAcronym() . '): Version ' . $this->GetSoftwareVersion(); } - public function GetSoftwareNameAndAcronym() - { + public function GetSoftwareNameAndAcronym() { return $this->GetSoftwareName() . ' (' . $this->GetSoftwareAcronym() . ')'; } - public function GetSoftwareAcronymAndVersion() - { + public function GetSoftwareAcronymAndVersion() { return $this->GetSoftwareAcronym() . ' V. ' . $this->GetSoftwareVersion(); } } diff --git a/classes/Format/PDF.php b/classes/Format/PDF.php index 831e3c9..01a5db4 100644 --- a/classes/Format/PDF.php +++ b/classes/Format/PDF.php @@ -109,8 +109,7 @@ public function Construct_Requires() { // ----------------------------------------------- public function Display() { - if(!$this->PrepareScriptForPDFConversion()) - { + if(!$this->PrepareScriptForPDFConversion()) { return FALSE; } @@ -122,8 +121,7 @@ public function Display() { $pdf_input = $this->SetHTMLForPDFConversion(); - if(!$pdf_input) - { + if(!$pdf_input) { return FALSE; } @@ -131,8 +129,7 @@ public function Display() { $old_pdf_input = ''; - if(is_file($source_file_location)) - { + if(is_file($source_file_location)) { $old_pdf_input = file_get_contents($source_file_location); } if($_GET['forceregen'] || !is_file($pdf_file_location) || $old_pdf_input != $pdf_input) { diff --git a/classes/Globals/anarchistcode.php b/classes/Globals/anarchistcode.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/anarchistcode.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/clonefrom.php b/classes/Globals/clonefrom.php index 98ffacd..f8349e9 100644 --- a/classes/Globals/clonefrom.php +++ b/classes/Globals/clonefrom.php @@ -37,6 +37,16 @@ public function DBInfo() { ]; } + public function DictionaryDBInfo() { + $info = $this->DBInfo(); + return [ + 'username'=>$info['username'], + 'password'=>$info['password'], + 'hostname'=>'mysql.anotherwebsitemaybe.com', # this should be the name of the server hosting this mysql db + 'database'=>'alldictionaries', + ]; + } + public function NewRandomPasswordSeed() { return 'oeuidoeydf5a3p3u3'; } diff --git a/classes/Globals/clonefrom_copy.php b/classes/Globals/clonefrom_copy.php new file mode 100644 index 0000000..f8349e9 --- /dev/null +++ b/classes/Globals/clonefrom_copy.php @@ -0,0 +1,374 @@ +primaryhost = $this->PrimaryHostInfo(); + $this->db = $this->DBInfo(); + $this->mainmenu = $this->MainMenu(); + $this->styling = $this->Styling(); + $this->passwordseed = $this->NewRandomPasswordSeed(); + $this->apidata = $this->SetAPIData(); + $this->functionality = [ + 'sharing'=>$this->SharingInfo(), + ]; + + return $this; + } + // Primary Host Info + // ------------------------------------------------------------------- + + public function PrimaryHostInfo() { + return [ + 'id'=>0, + ]; + } + + // DB Info + // ------------------------------------------------------------------- + + public function DBInfo() { + return [ + 'username'=>'insert-username-here', + 'password'=>'insert-password-here', + 'hostname'=>'mysql.website.com', + ]; + } + + public function DictionaryDBInfo() { + $info = $this->DBInfo(); + return [ + 'username'=>$info['username'], + 'password'=>$info['password'], + 'hostname'=>'mysql.anotherwebsitemaybe.com', # this should be the name of the server hosting this mysql db + 'database'=>'alldictionaries', + ]; + } + + public function NewRandomPasswordSeed() { + return 'oeuidoeydf5a3p3u3'; + } + + public function SetAPIData() { + return []; + } + + // Main Menu Info + // ------------------------------------------------------------------- + + // Master List + // ------------------------------------------------------------------- + + public function MainMenu() { + return [ + 'home'=>[ + 'url'=>$this->MainMenu_URL_Home(), + 'text'=>[ + 'en'=>'Home', + 'de'=>'Zuhause', + 'es'=>'Casa', + 'fr'=>'Accueil', + 'ja'=>'ホーム', + 'it'=>'Casa', + 'nl'=>'Huis', + 'pl'=>'Dom', + 'pt'=>'Casa', + 'ru'=>'Главная', + 'tr'=>'Ev', + 'zh'=>'家', + ], + 'enabled'=>$this->MainMenu_Enabled_Home(), + ], + 'about'=>[ + 'url'=>$this->MainMenu_URL_About(), + 'text'=>[ + 'en'=>'About', + 'de'=>'Etwa', + 'es'=>'Acerca de', + 'fr'=>'Sur', + 'ja'=>'約', + 'it'=>'Di', + 'nl'=>'Over', + 'pl'=>'O', + 'pt'=>'Sobre', + 'ru'=>'Около', + 'tr'=>'hakkında', + 'zh'=>'关于', + ], + 'enabled'=>$this->MainMenu_Enabled_About(), + ], + 'contact'=>[ + 'url'=>$this->MainMenu_URL_Contact(), + 'text'=>[ + 'en'=>'Contact', + 'de'=>'Kontakt', + 'es'=>'Contacto', + 'fr'=>'Contact', + 'ja'=>'接触', + 'it'=>'Contatto', + 'nl'=>'Contact', + 'pl'=>'Kontakt', + 'pt'=>'Contato', + 'ru'=>'контакт', + 'tr'=>'Temas', + 'zh'=>'联系', + ], + 'enabled'=>$this->MainMenu_Enabled_Contact(), + ], + 'search'=>[ + 'url'=>$this->MainMenu_URL_Search(), + 'text'=>[ + 'en'=>'Search', + 'de'=>'Suche', + 'es'=>'Buscar', + 'fr'=>'Chercher', + 'ja'=>'サーチ', + 'it'=>'Ricerca', + 'nl'=>'Zoeken', + 'pl'=>'Szukaj', + 'pt'=>'Procurar', + 'ru'=>'Поиск', + 'tr'=>'Arama', + 'zh'=>'搜索', + ], + 'enabled'=>$this->MainMenu_Enabled_Search(), + ], + 'languages'=>[ + 'url'=>$this->MainMenu_URL_Languages(), + 'text'=>[ + 'en'=>'Languages', + 'de'=>'Sprachen', + 'es'=>'Idiomas', + 'fr'=>'Langues', + 'ja'=>'言語', + 'it'=>'Le lingue', + 'nl'=>'Talen', + 'pl'=>'Języki', + 'pt'=>'Idiomas', + 'ru'=>'Языки', + 'tr'=>'Diller', + 'zh'=>'语言', + ], + 'enabled'=>$this->MainMenu_Enabled_Languages(), + ], + 'privacypolicy'=>[ + 'url'=>$this->MainMenu_URL_PrivacyPolicy(), + 'text'=>[ + 'en'=>'Privacy Policy', + 'de'=>'Datenschutz-Bestimmungen', + 'es'=>'Política de privacidad', + 'fr'=>'Politique de confidentialité', + 'ja'=>'個人情報保護方針', + 'it'=>'politica sulla riservatezza', + 'nl'=>'Privacybeleid', + 'pl'=>'Polityka prywatności', + 'pt'=>'Política de Privacidade', + 'ru'=>'политика конфиденциальности', + 'tr'=>'Gizlilik Politikası', + 'zh'=>'隐私政策', + ], + 'enabled'=>$this->MainMenu_Enabled_PrivacyPolicy(), + ], + 'terms'=>[ + 'url'=>$this->MainMenu_URL_Terms(), + 'text'=>[ + 'en'=>'Terms and Conditions', + 'de'=>'Geschäftsbedingungen', + 'es'=>'Términos y Condiciones', + 'fr'=>'Termes et conditions', + 'ja'=>'規約と条件', + 'it'=>'Termini e condizioni', + 'nl'=>'Voorwaarden', + 'pl'=>'Regulamin', + 'pt'=>'Termos e Condições', + 'ru'=>'Условия и положения', + 'tr'=>'Şartlar ve koşullar', + 'zh'=>'条款和条件', + ], + 'enabled'=>$this->MainMenu_Enabled_Terms(), + ], + 'codeofconduct'=>[ + 'url'=>$this->MainMenu_URL_CodeOfConduct(), + 'text'=>[ + 'en'=>'Code of Conduct', + 'de'=>'Verhaltensregeln', + 'es'=>'Código de Conducta', + 'fr'=>'Code de conduite', + 'ja'=>'行動規範', + 'it'=>'Codice di condotta', + 'nl'=>'Gedragscode', + 'pl'=>'Kodeks postępowania', + 'pt'=>'Código de conduta', + 'ru'=>'Нормы поведения', + 'tr'=>'Davranış kodu', + 'zh'=>'行为守则', + ], + 'enabled'=>$this->MainMenu_Enabled_CodeOfConduct(), + ], + 'login'=>[ + 'url'=>$this->MainMenu_URL_Login(), + 'text'=>[ + 'en'=>'Login', + 'de'=>'Anmeldung', + 'es'=>'Iniciar sesión', + 'fr'=>'S\'identifier', + 'ja'=>'ログイン', + 'it'=>'Accesso', + 'nl'=>'Log in', + 'pl'=>'Zaloguj Się', + 'pt'=>'Entrar', + 'ru'=>'Авторизоваться', + 'tr'=>'Oturum aç', + 'zh'=>'登录', + ], + 'enabled'=>$this->MainMenu_Enabled_Login(), + ], + ]; + } + + // URLs + // ------------------------------------------------------------------- + + public function MainMenu_URL_Home() { + return '/'; + } + + public function MainMenu_URL_About() { + return '/about.php'; + } + + public function MainMenu_URL_Contact() { + return '/contact.php'; + } + + public function MainMenu_URL_Search() { + return '/search.php'; + } + + public function MainMenu_URL_Languages() { + return '/languages.php'; + } + + public function MainMenu_URL_PrivacyPolicy() { + return '/privacy.php'; + } + + public function MainMenu_URL_Terms() { + return '/terms.php'; + } + + public function MainMenu_URL_CodeOfConduct() { + return '/codeofconduct.php'; + } + + public function MainMenu_URL_Login() { + return '/login.php'; + } + + // Enabled/Disabled + // ------------------------------------------------------------------- + + public function MainMenu_Enabled_Home() { + return TRUE; + } + + public function MainMenu_Enabled_About() { + return TRUE; + } + + public function MainMenu_Enabled_Contact() { + return TRUE; + } + + public function MainMenu_Enabled_Search() { + return FALSE; + } + + public function MainMenu_Enabled_Languages() { + return FALSE; + } + + public function MainMenu_Enabled_PrivacyPolicy() { + return TRUE; + } + + public function MainMenu_Enabled_Terms() { + return TRUE; + } + + public function MainMenu_Enabled_CodeOfConduct() { + return FALSE; + } + + public function MainMenu_Enabled_Login() { + return FALSE; + } + + // Styling Info + // ------------------------------------------------------------------- + + public function Styling() { + return [ + 'PrimaryColor'=>'6495ED', + 'SecondaryColor'=>'C2DFFF', + 'ThirdColor'=>'B7CEEC', + ]; + } + + // Functionality Info + // ------------------------------------------------------------------- + + public function SharingInfo() { + return [ + 'text'=>[ + 'Share'=>[ + 'en'=>'Share', + 'de'=>'Aktie', + 'es'=>'Compartir', + 'fr'=>'Partager', + 'ja'=>'シェア', + 'it'=>'Condividere', + 'nl'=>'Delen', + 'pl'=>'Dzielić', + 'pt'=>'Compartilhar', + 'ru'=>'Поделиться', + 'tr'=>'Pay', + 'zh'=>'分享', + ], + 'Share With'=>[ + 'en'=>'Share With', + 'de'=>'Teilen mit', + 'es'=>'Compartir con', + 'fr'=>'Partager avec', + 'ja'=>'と共有する', + 'it'=>'Condividi con', + 'nl'=>'Delen met', + 'pl'=>'Udostępniać', + 'pt'=>'Compartilhar com', + 'ru'=>'Разрешить', + 'tr'=>'İle paylaş', + 'zh'=>'与某人分享', + ], + ], + ]; + } + + /* + 'en'=>'', + 'de'=>'', + 'es'=>'', + 'fr'=>'', + 'ja'=>'', + 'it'=>'', + 'nl'=>'', + 'pl'=>'', + 'pt'=>'', + 'ru'=>'', + 'tr'=>'', + 'zh'=>'', + */ + } + +?> \ No newline at end of file diff --git a/classes/Globals/copyleftlicense.php b/classes/Globals/copyleftlicense.php new file mode 100644 index 0000000..46d3e12 --- /dev/null +++ b/classes/Globals/copyleftlicense.php @@ -0,0 +1,20 @@ +[ + 'client_id'=>'139023963905-orlvtdsufuphn5lfoalbn0ekee3v5kjr.apps.googleusercontent.com', + 'client_secret'=>'qVeRpLZ1VQCKcxYJD6NKAsIc', + ], + ]; + } + + public function MainMenu_Enabled_Search() { + return TRUE; + } + } + +?> \ No newline at end of file diff --git a/classes/Globals/earthfluent.php b/classes/Globals/earthfluent.php new file mode 100644 index 0000000..42d5a0d --- /dev/null +++ b/classes/Globals/earthfluent.php @@ -0,0 +1,16 @@ +[ + 'client_id'=>'413599668789-7q6lpe6ut0uoied3lq9ec76g4buu6jt1.apps.googleusercontent.com', + 'client_secret'=>'he_nQIqXMg0ndLpkNOETx_FX', + ], + ]; + } + } + +?> \ No newline at end of file diff --git a/classes/Globals/holdoffhunger.php b/classes/Globals/holdoffhunger.php new file mode 100644 index 0000000..7df33aa --- /dev/null +++ b/classes/Globals/holdoffhunger.php @@ -0,0 +1,14 @@ +[ + 'client_id'=>'17782956300-goka34cojti203t52koo1asdrju76peh.apps.googleusercontent.com', + 'client_secret'=>'_tr9WRXPNqS3672nkR3tVM-u', + ], + ]; + } + } + +?> \ No newline at end of file diff --git a/classes/Globals/listkeywords.php b/classes/Globals/listkeywords.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/listkeywords.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/ourbooklife.php b/classes/Globals/ourbooklife.php new file mode 100644 index 0000000..3849dd5 --- /dev/null +++ b/classes/Globals/ourbooklife.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/classes/Globals/ouruprising.php b/classes/Globals/ouruprising.php new file mode 100644 index 0000000..3849dd5 --- /dev/null +++ b/classes/Globals/ouruprising.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/classes/Globals/pronouncethat.php b/classes/Globals/pronouncethat.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/pronouncethat.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/punkerslut.php b/classes/Globals/punkerslut.php new file mode 100644 index 0000000..3849dd5 --- /dev/null +++ b/classes/Globals/punkerslut.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/classes/Globals/removeblanklines.php b/classes/Globals/removeblanklines.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/removeblanklines.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/removeduplicatelines.php b/classes/Globals/removeduplicatelines.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/removeduplicatelines.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/removespacing.php b/classes/Globals/removespacing.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/removespacing.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/revoltlib.php b/classes/Globals/revoltlib.php new file mode 100644 index 0000000..66b6c98 --- /dev/null +++ b/classes/Globals/revoltlib.php @@ -0,0 +1,28 @@ +[ + 'client_id'=>'31222432483-8qvk3uhd27ce8ct5hdhfqb41hh34ihls.apps.googleusercontent.com', + 'client_secret'=>'FB4dPeTj_uCg1Jn_LJPUIlOH', + ], + ]; + } + + // Styling Info + // ------------------------------------------------------------------- + + public function Styling() { + return [ + 'PrimaryColor'=>'DDDDDD', + 'SecondaryColor'=>'AAAAAA', + ]; + } + } + +?> \ No newline at end of file diff --git a/classes/Globals/revoltlink.php b/classes/Globals/revoltlink.php new file mode 100644 index 0000000..37c5945 --- /dev/null +++ b/classes/Globals/revoltlink.php @@ -0,0 +1,16 @@ +[ + 'client_id'=>'576522180186-877c9s89ep0lmk9bn212atdn43pf32dv.apps.googleusercontent.com', + 'client_secret'=>'O2vRYrYWuf-RZRFHwo4VMKzP', + ], + ]; + } + } + +?> \ No newline at end of file diff --git a/classes/Globals/revoltsource.php b/classes/Globals/revoltsource.php new file mode 100644 index 0000000..3849dd5 --- /dev/null +++ b/classes/Globals/revoltsource.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/classes/Globals/sharelineup.php b/classes/Globals/sharelineup.php new file mode 100644 index 0000000..3849dd5 --- /dev/null +++ b/classes/Globals/sharelineup.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/classes/Globals/sortwords.php b/classes/Globals/sortwords.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/sortwords.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Globals/wordweight.php b/classes/Globals/wordweight.php new file mode 100644 index 0000000..aecfb86 --- /dev/null +++ b/classes/Globals/wordweight.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/classes/Language/Dictionary.php b/classes/Language/Dictionary.php index 525e8ce..812ef4a 100644 --- a/classes/Language/Dictionary.php +++ b/classes/Language/Dictionary.php @@ -1,33 +1,32 @@ hostname = 'mysql.earthfluent.com'; - $this->username = 'ouruprising'; - $this->password = 'OE88dd8dd82d'; - $this->database = 'alldictionaries'; + public function __construct($args) { + $this->globals = $args['globals']; + + $globals = $this->globals->DictionaryDBInfo(); + $this->hostname = $globals['hostname']; + $this->username = $globals['username']; + $this->password = $globals['password']; + $this->database = $globals['database']; + + return TRUE; } - function __destruct() - { + function __destruct() { return $this->DBEnd(); } - public function LookUpWords($args) - { + public function LookUpWords($args) { $words_to_look_up = $args['words']; - if(!$words_to_look_up) - { + if(!$words_to_look_up) { return []; } - if(!$this->db_link) - { + if(!$this->db_link) { $this->DBStart(); } @@ -79,12 +78,10 @@ public function LookUpWords($args) return $definitions; } - public function LookUpWord($args) - { + public function LookUpWord($args) { $word_to_look_up = $args['word']; - if(!$this->db_link) - { + if(!$this->db_link) { $this->DBStart(); } @@ -110,25 +107,22 @@ public function LookUpWord($args) $sql .= ' Definition.Term = ? '; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'s', - recordvalues=>[$word_to_lookup_up], + 'query'=>$sql, + 'sqlbindstring'=>'s', + 'recordvalues'=>[$word_to_lookup_up], ]; return $this->FillArraysFromDB($fill_arrays_from_db_args); } - public function LookUpRandomWords($args) - { - if(!$this->db_link) - { + public function LookUpRandomWords($args) { + if(!$this->db_link) { $this->DBStart(); } $random_word_count = $args['randomwordcount']; - if(!$random_word_count) - { + if(!$random_word_count) { $random_word_count = 50; } @@ -156,18 +150,16 @@ public function LookUpRandomWords($args) $sql .= ' LIMIT ' . $random_word_count; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'', - recordvalues=>[], + 'query'=>$sql, + 'sqlbindstring'=>'', + 'recordvalues'=>[], ]; $db_results = $this->FillArraysFromDB($fill_arrays_from_db_args); $definitions = []; - foreach ($db_results as $definition) - { - if(!$definitions[strtolower($definition['Term'])]) - { + foreach ($db_results as $definition) { + if(!$definitions[strtolower($definition['Term'])]) { $definitions[strtolower($definition['Term'])] = []; } @@ -177,19 +169,17 @@ public function LookUpRandomWords($args) return $definitions; } - public function GetDefinitionsCount($args) - { - if(!$this->db_link) - { + public function GetDefinitionsCount($args) { + if(!$this->db_link) { $this->DBStart(); } $sql = 'SELECT COUNT(id) AS DefinitionCount FROM Definition;'; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'', - recordvalues=>[], + 'query'=>$sql, + 'sqlbindstring'=>'', + 'recordvalues'=>[], ]; $definitions_count = $this->FillArraysFromDB($fill_arrays_from_db_args); @@ -197,19 +187,17 @@ public function GetDefinitionsCount($args) return $definitions_count[0]['DefinitionCount']; } - public function GetWordsCount($args) - { - if(!$this->db_link) - { + public function GetWordsCount($args) { + if(!$this->db_link) { $this->DBStart(); } $sql = 'SELECT COUNT(DISTINCT Term) AS WordCount FROM Definition;'; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'', - recordvalues=>[], + 'query'=>$sql, + 'sqlbindstring'=>'', + 'recordvalues'=>[], ]; $definitions_count = $this->FillArraysFromDB($fill_arrays_from_db_args); @@ -217,19 +205,17 @@ public function GetWordsCount($args) return $definitions_count[0]['WordCount']; } - public function GetDictionariesCount($args) - { - if(!$this->db_link) - { + public function GetDictionariesCount($args) { + if(!$this->db_link) { $this->DBStart(); } $sql = 'SELECT COUNT(id) AS DictionaryCount FROM Dictionary;'; $fill_arrays_from_db_args = [ - query=>$sql, - sqlbindstring=>'', - recordvalues=>[], + 'query'=>$sql, + 'sqlbindstring'=>'', + 'recordvalues'=>[], ]; $definitions_count = $this->FillArraysFromDB($fill_arrays_from_db_args); @@ -240,14 +226,12 @@ public function GetDictionariesCount($args) // Start/Stop the DB // ------------------------------------------------- - public function DBStart() - { + public function DBStart() { error_reporting(E_ERROR); $this->db_link = new mysqli($this->hostname,$this->username,$this->password,$this->database); - if($this->db_link->connect_errno) - { + if($this->db_link->connect_errno) { $this->hostname = 'mysql.' . $this->database . '.com'; $this->db_link = new mysqli($this->hostname,$this->username,$this->password,$this->database); } @@ -257,24 +241,20 @@ public function DBStart() $results = 1; $errors = []; - if($this->db_link->connect_errno) - { + if($this->db_link->connect_errno) { $results = 0; $errors[] = [ - errornumber=>$this->db_link->connect_errno, - errormessage=>$this->db_link->connect_error, + 'errornumber'=>$this->db_link->connect_errno, + 'errormessage'=>$this->db_link->connect_error, ]; - } - else - { + } else { unset($this->hostname); unset($this->username); unset($this->password); unset($this->database); } - if($this->db_link->connect_error) - { + if($this->db_link->connect_error) { http_response_code(500); die ("Database unavailable. =("); } @@ -282,38 +262,32 @@ public function DBStart() $this->db_link->set_charset("utf8"); return [ - results=>$results, - errors=>$errors, + 'results'=>$results, + 'errors'=>$errors, ]; } - public function DBEnd() - { - if(!$this->db_link->connect_error) - { + public function DBEnd() { + if(!$this->db_link->connect_error) { return mysqli_close($this->db_link); } return TRUE; } - public function FillArraysFromDB($args) - { - $query = $args[query]; - $sqlbindstring = $args[sqlbindstring]; - $recordvalues = $args[recordvalues]; + public function FillArraysFromDB($args) { + $query = $args['query']; + $sqlbindstring = $args['sqlbindstring']; + $recordvalues = $args['recordvalues']; $prepare_line = __LINE__; # Current line number $statement = $this->db_link->prepare($query); - if($statement) - { - if($sqlbindstring) - { + if($statement) { + if($sqlbindstring) { $bind_arguments = []; $bind_arguments[] = $sqlbindstring; - foreach ($recordvalues as $recordkey => $recordvalue) - { + foreach ($recordvalues as $recordkey => $recordvalue) { $bind_arguments[] = & $recordvalues[$recordkey]; } @@ -338,12 +312,10 @@ public function FillArraysFromDB($args) $statement->execute(); $result = $statement->get_result(); - if($result) - { - while ($row = $result->fetch_assoc()) - { + if($result) { + while ($row = $result->fetch_assoc()) { $format_row_args = [ - row=>$row, + 'row'=>$row, ]; $objects[] = $this->FillArraysFromDB_FormatRow($format_row_args); } @@ -366,8 +338,7 @@ public function FillArraysFromDB($args) # http://php.net/manual/en/language.constants.predefined.php } - public function GetError($args) - { + public function GetError($args) { $error_pieces = $args; $error = []; @@ -376,8 +347,7 @@ public function GetError($args) $error['error'] = $this->db_link->error; $error['errornumber'] = $this->db_link->errno; - foreach ($error_pieces as $error_piece_key => $error_piece_value) - { + foreach ($error_pieces as $error_piece_key => $error_piece_value) { $error[$error_piece_key] = $error_piece_value; } @@ -395,25 +365,21 @@ public function GetError($args) return $error; } - public function FillArraysFromDB_FormatRow($args) - { - $row = $args[row]; + public function FillArraysFromDB_FormatRow($args) { + $row = $args['row']; $sub_tables = []; - foreach ($row as $field_name => $field_value) - { + foreach ($row as $field_name => $field_value) { $first_row_field_name_char = substr($field_name, 0, 1); - if($first_row_field_name_char == '.') - { + if($first_row_field_name_char == '.') { $row_explosion = explode('.', $field_name); $joined_table_name = $row_explosion[1]; $joined_table_field = $row_explosion[2]; - if(!$sub_tables[$joined_table_name]) - { + if(!$sub_tables[$joined_table_name]) { $sub_tables[$joined_table_name] = []; } @@ -422,8 +388,7 @@ public function FillArraysFromDB_FormatRow($args) } } - foreach ($sub_tables as $sub_table => $sub_table_fields) - { + foreach ($sub_tables as $sub_table => $sub_table_fields) { $row[strtolower($sub_table)] = $sub_table_fields; } diff --git a/classes/Language/EnglishMisspellings.php b/classes/Language/EnglishMisspellings.php index b483fa9..fec7cf3 100644 --- a/classes/Language/EnglishMisspellings.php +++ b/classes/Language/EnglishMisspellings.php @@ -18,9 +18,27 @@ class EnglishMisspellings { public function __construct($args) { require('../classes/Language/EnglishMisspellings_Words.php'); - $this->words = new EnglishMisspellings_Words([]); + $this->words = new EnglishMisspellings_Words(); $this->misspellings = $this->words->GetEnglishMisspellings(); return TRUE; } + + public function GetWords_Misspelled() { + $misspelled_words = array_values($this->misspellings); + + $misspellings = []; + + foreach($misspelled_words as $misspelled_word) { + if(is_array($misspelled_word)) { + foreach($misspelled_word as $multi_misspelling) { + $misspellings[] = $multi_misspelling; + } + } else { + $misspellings[] = $misspelled_word; + } + } + + return $misspellings; + } } ?> \ No newline at end of file diff --git a/classes/Language/EnglishMisspellings_Words.php b/classes/Language/EnglishMisspellings_Words.php index 73471c3..17f6392 100644 --- a/classes/Language/EnglishMisspellings_Words.php +++ b/classes/Language/EnglishMisspellings_Words.php @@ -16,6 +16,7 @@ class EnglishMisspellings_Words { */ public function __construct($args) { + $this->args = $args; return TRUE; } diff --git a/classes/Language/IntensiveEnglishMisspellings.php b/classes/Language/IntensiveEnglishMisspellings.php new file mode 100644 index 0000000..11e9695 --- /dev/null +++ b/classes/Language/IntensiveEnglishMisspellings.php @@ -0,0 +1,44 @@ +words = new IntensiveEnglishMisspellings_Words(); + $this->misspellings = $this->words->GetIntensiveEnglishMisspellings(); + return TRUE; + } + + public function GetWords_Misspelled() { + $misspelled_words = array_values($this->misspellings); + + $misspellings = []; + + foreach($misspelled_words as $misspelled_word) { + if(is_array($misspelled_word)) { + foreach($misspelled_word as $multi_misspelling) { + $misspellings[] = $multi_misspelling; + } + } else { + $misspellings[] = $misspelled_word; + } + } + + return $misspellings; + } + } +?> \ No newline at end of file diff --git a/classes/Language/IntensiveEnglishMisspellings_Words.php b/classes/Language/IntensiveEnglishMisspellings_Words.php new file mode 100644 index 0000000..a4d5fbd --- /dev/null +++ b/classes/Language/IntensiveEnglishMisspellings_Words.php @@ -0,0 +1,52 @@ +args = $args; + return TRUE; + } + + /* GetAmericanToBritishSpellings() + + Build a mapping of Misspellings from the /Language/Words/EnglishMisspellings/ classes. + + */ + + public function GetIntensiveEnglishMisspellings() { + $word_hash = []; + + $word_directory = '../classes/Language/Words/IntensiveEnglishMisspellings/'; + + $letters = ['0']; + $letters = array_merge($letters, range('A', 'Z')); + + foreach($letters as $letter) { + $word_class = 'IntensiveEnglishMisspellingsWords_' . $letter; + $word_file = $word_class . '.php'; + $word_file_location = $word_directory . $word_file; + require($word_file_location); + $word_object = new $word_class([]); + + $words = $word_object->EnglishMisspellingsWords(); + + $word_hash = array_merge($word_hash, $words); + } + + return $word_hash; + } + } +?> \ No newline at end of file diff --git a/classes/Language/Words/AmericanBritish/AmericanBritishWords_T.php b/classes/Language/Words/AmericanBritish/AmericanBritishWords_T.php index d82de93..50a73bb 100644 --- a/classes/Language/Words/AmericanBritish/AmericanBritishWords_T.php +++ b/classes/Language/Words/AmericanBritish/AmericanBritishWords_T.php @@ -449,6 +449,7 @@ public function AmericanBritishWords() { 'tittuping'=>'tittupping', 'tittupings'=>'tituppings', 'tittupy'=>'tittuppy', + 'today'=>['today', 'to-day',], 'toffee\'s'=>'toffy\'s', 'toffee'=>'toffy', 'toffees'=>'toffies', @@ -461,6 +462,7 @@ public function AmericanBritishWords() { 'tolstoy'=>['tolstoi', 'tolstoï', 'tólstóy', 'tólstói', 't́olstóy',], 'tolstoy\'s'=>['tolstoi\'s', 'tolstoï\'s', 'tólstóy\'s', 'tólstói\'s', 't́olstói\'s', 't́olstóy\'s',], 'tolstoyan'=>['tolstoian','tolstoyian','tolstoïan', 'tolstoïian', 'tólstóyan', 'tólstóyian', 't́olstóian', 't́olstóyan',], + 'tomorrow'=>['tomorrow', 'to-morrow',], 'tonicize'=>'tonicise', 'tonicizes'=>'tonicises', 'topee\'s'=>'topi\'s', diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_0.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_0.php index d45517f..00fee2c 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_0.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_0.php @@ -26,16 +26,142 @@ public function __construct($args) { */ public function EnglishMisspellingsWords() { - return [ - '1,000'=>'1000', - '1,100'=>'1100', - '1,200'=>'1200', - - '1800mm'=>'1,800 mm', + + /* TODO - 'I900'=>'1900', - '19OO'=>'1900', + 1870s=>1870's + + https://www.oreilly.com/library/view/mysql-cookbook/0596001452/ch04s13.html + + */ + + return $this->GenerateNumberOCRProblems(); + } + + public function GetOCRMatchups() { + $matchups = [ + '0'=>'O', + '1'=>'I', + # '5'=>'S', + # '8'=>'S', + # '9'=>'S', ]; + + return $matchups; + } + + public function GenerateNumberOCRProblems() { + $misspelled_words = []; + $matchups = $this->GetOCRMatchups(); + + $numberth_separators = ['', ' ']; + + for($i = 0; $i < 1000; $i++) { + foreach($numberth_separators as $numberth_separator) { + $modulo = $i % 10; + if($modulo == 1) { + $word = $i . $numberth_separator . 'st'; + } elseif($modulo == 2) { + $word = $i . $numberth_separator . 'nd'; + } elseif($modulo == 3) { + $word = $i . $numberth_separator . 'rd'; + } else { + $word = $i . $numberth_separator . 'th'; + } + + $interpolated_options = $this->InterpolateStrings(['matchups'=>$matchups, 'number'=>$word]); + + if(count($interpolated_options)) { + $misspelled_words[$word] = $interpolated_options; + } + } + } + + $min = 1; + $max = 10000; + + for($i = $min; $i < $max; $i++) { + $interpolated_options = $this->InterpolateStrings(['matchups'=>$matchups, 'number'=>$i]); + + if(count($interpolated_options)) { + $misspelled_words[$i] = $interpolated_options; + } + + if($i >= 1000) { + // $misspelled_words[$i][] = $i; + } + } + + // $misspelled_words['[sic]'] = [ + // '[sic]', + // '(sic)', + // ]; + + # print("
");
+		#	print_r($misspelled_words);
+		#	print("
"); + #die("why"); + return $misspelled_words; + } + + public function InterpolateStrings($args) { + $number = $args['number']; + $matchups = $args['matchups']; + + $possible_chars = str_split($number); + $possible_chars_count = count($possible_chars); + $interoperable_chars = []; + + for($i = 0; $i < $possible_chars_count; $i++) { + $possible_char = $possible_chars[$i]; + + if($matchups[$possible_char]) { + $interoperable_chars[] = $possible_char; + } + } + + $interoperable_chars_count = count($interoperable_chars); + $max_interpolations = pow(2, $interoperable_chars_count); + + if($interoperable_chars_count == 0) { + return []; + } + + $pad_length = $interoperable_chars_count; + $matchup_keys = array_keys($matchups); + + $interpolated_strings = []; + + for($i = 1; $i < $max_interpolations; $i++) { + $binary = decbin($i); + $full_binary = str_pad($binary, $pad_length, '0', STR_PAD_LEFT); + + $binary_chars = str_split($full_binary); + $binary_index = 0; + + $interpreted_string = (string)$number; + + $binary_char = $binary_chars[0]; + for($j = 0; $j < $possible_chars_count; $j++) { + $possible_char = $possible_chars[$j]; + if($matchups[$possible_char]) { + #print("SOY!" . $possible_char . "|\n\n"); + + if($binary_chars[$binary_index]) { + $matchup = $matchups[$possible_char]; + $interpreted_string[$j] = $matchup; + } + $binary_index++; + $binary_char = $binary_chars[$binary_index]; + } + } + + if(preg_match('/[0-9]/', $interpreted_string)) { + $interpolated_strings[] = $interpreted_string; + } + } + + return $interpolated_strings; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_A.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_A.php index 4f4a12a..03903a0 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_A.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_A.php @@ -27,6 +27,244 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'a lot of'=>'alot of', + 'aboard'=>'abaord', + 'abolition'=>'aboliton', + 'abolitionism'=>'abolitonism', + 'abolitionist'=>'abolitonist', + 'about'=>[ + 'abont', + 'about about', + ], + 'absolute'=>'absoute', + 'absolutely'=>'absoutely', + 'abstraction'=>[ + 'abstration', + 'abtraction', + ], + 'abstracts'=>[ + 'abtracts', + ], + 'accidentally'=>'accidently', + 'accommodate'=>'accomodate', + 'accompaniment'=>[ + 'accompanement', + 'accompaniament', + 'accompaniement', + 'accompanyment', + ], + 'accompanying'=>'accompaning', + 'according'=>'acording', + 'accordingly'=>'acordingly', + 'accused'=>'accussed', + 'achtung'=>'actung', + 'active'=>[ + 'actiev', + 'activ', + ], + 'actively'=>[ + 'actievly', + 'activly', + ], + 'adaptation'=>'adaptaion', + 'addition'=>[ + 'additon', + 'addtion', + 'adition', + ], + 'additional'=>[ + 'additonal', + 'addtional', + 'aditional', + ], + 'additionally'=>[ + 'additonally', + 'addtionally', + 'aditionally', + ], + 'adolescence'=>'adolesence', + 'advancing'=>['adavancing',], + 'affair'=>[ + 'afair', + 'affir', + ], + 'affairs'=>[ + 'afairs', + 'affiairs', + 'affirs', + ], + 'affiliate'=>[ + 'affiliat', + 'afiliate', + ], + 'affiliation'=>[ + 'affilation', + 'afiliation', + ], + 'affordable'=>'afordable', + 'after'=>['afterr',], + 'against'=>[ + 'againts', + 'againtst', + 'agaisnt', + 'agaist', + 'aganist', + ], + 'agreement'=>'aggrement', + 'agricultural'=>[ + 'agriculural', + 'agriculutural', + 'agricutural', + ], + 'agriculture'=>[ + 'agriculuture', + 'agricuture', + ], + 'alarmed'=>'allarmed', + 'algebraic'=>'algebraical', + 'allotment'=>'alotment', + 'allotments'=>'alotments', + 'alteration'=>'alteraton', + 'although'=>'allthough', + 'aluminum'=>'alluminum', + 'always'=>'alwayes', + 'america'=>[ + 'amercia', + 'arnerica', + ], + 'american'=>[ + 'amercian', + 'arnerican', + ], + 'ammunition'=>'amunition', + 'analagious'=>'analagous', + 'anarchism'=>[ + 'anachism', + 'anarachism', + ], + 'anarchist'=>'anarachist', + 'anarchy'=>[ + 'anachy', + 'anarachy', + ], + 'and'=>'andd', + 'and he'=>'andhe', + 'and it'=>'nad it', + 'and so'=>'andso', + 'and the'=>[ + 'and te', + 'andthe', + ], + 'and then'=>'andthen', + 'and there'=>'andthere', + 'and thus'=>'an thus', + 'and with'=>'andwith', + 'anniversaries'=>'annyversaries', + 'anniversary'=>'annyversary', + 'annoyed'=>'anoyed', + 'annoying'=>'anoying', + 'anointment'=>'annointment', + 'anoited'=>'annoited', + 'anoiting'=>'annoiting', + 'another'=>'anthoer', + 'antagonist'=>'antogonist', + 'anthropological'=>'antropological', + 'anthropologist'=>'antropologist', + 'anthropology'=>'antropology', + 'anybody'=>[ + 'any body', + 'any-body', + ], + 'anyone'=>[ + 'any one', + 'any-one', + ], + 'Apartheid'=>'Aparthied', + 'appalling'=>'appaling', + 'appeal'=>[ + 'apeal', + 'apppeal', + ], + 'appealing'=>[ + 'apealing', + 'apppealing', + ], + 'appeals'=>[ + 'apeals', + 'apppeals', + ], + 'appearance'=>'apearance', + 'appeared'=>[ + 'appeard', + 'apppeared', + ], + 'appointment'=>[ + 'appoinment', + 'appointent', + 'appointmet', + ], + 'arboretum'=>'arboretium', + 'archbishop'=>'archibishop', + 'armistice'=>'annistice', + 'around'=>'aroound', + 'aroused'=>[ + 'aroussed', + 'arroused', + ], + 'arrest'=>'arest', + 'arrested'=>'arested', + 'arrived'=>['arrivde',], + 'arrondissement'=>'arrondisement', + 'arrondissements'=>'arrondisements', + 'artificial'=>'artifical', + 'as well'=>'as welll', + 'as well as'=>'as well ass', + 'assassin'=>[ + 'asassin', + 'assasin', + ], + 'assault'=>'assult', + 'assaulted'=>'assulted', + 'assaulting'=>'assualting', + 'assembling'=>'asembling', + 'assembly'=>'asembly', + 'assembled'=>'asssembled', + 'assembling'=>'asssembling', + 'assembly'=>[ + 'asembly', + 'assemebly', + 'assemnbly', + 'asssembly', + ], + 'assessment'=>[ + 'assesment', + 'asessment', + ], + 'assistance'=>'asssitance', + 'associate'=>'asssociate', + 'assuage'=>'assauge', + 'assume'=>'asssume', + 'assumption'=>'assumpton', + 'at'=>'at at', + 'at the'=>['athe',], + 'attempted'=>'attemped', + 'australia'=>[ + 'australa', + 'australai', + ], + 'australian'=>[ + 'australain', + 'australan', + ], + 'austrian'=>'austran', + 'authority'=>'athority', + 'award'=>'aword', + 'awarded'=>'aworded', + 'awesome'=>[ + 'awsome', + 'awseome', + ], + 'axiom'=>'anxiom', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_B.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_B.php index 70174e3..dbcc40b 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_B.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_B.php @@ -27,6 +27,87 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'baghdad'=>'bagdad', + 'barricades'=>'baricades', + 'bastille'=>'bastile', + 'batallion'=>[ + 'batallian', + 'batallion', + 'batalian', + 'batalion', + ], + 'batallions'=>[ + 'batallians', + 'batallions', + 'batalians', + 'batalions', + ], + 'bazaar'=>['baazar',], + 'bestialities'=>['beastialities',], + 'bestiality'=>['beastiality',], + 'beauty'=>'beautiy', + 'because'=>['becuase',], + 'become'=>'beceme', + 'beginning'=>['begining',], + 'behavior'=>'behaivor', + 'beijing'=>[ + 'beijng', + 'bejing', + ], + 'beleaguered'=>[ + 'beleagered', + 'beleagured', + ], + 'belgrade'=>'belgade', + 'believed'=>'beleived', + 'belleville'=>['bellevile',], + 'benefited'=>'benefitted', + 'beside the'=>['besidet he',], + 'besides'=>'beised', + 'betrayal'=>'betrayel', + 'between'=>'beween', + 'billiard'=>['biliard',], + 'Bolivarian'=>'Boliviarian', + 'bourgeoisie'=>['borgeoisie',], + 'boulevards'=>['boulevarsd', 'boulvarsd',], + 'boycott'=>'boycot', + 'brazilian'=>[ + 'brazilan', + 'brazillan', + 'brazillian', + 'brazillion', + ], + 'brigade'=>'brigaded', + 'brilliant'=>['briliant',], + 'British'=>'Britis', + 'broad'=>['boroad',], + 'brother'=>['borther',], + 'brought'=>[ + 'brough', + ], + 'backetfuls'=>'bucketsful', + 'buddhist'=>[ + 'budhist', + ], + 'builder'=>[ + 'buiIder', + 'bulider', + ], + 'builders'=>[ + 'buiIders', + 'buliders', + ], + 'building'=>[ + 'buiIding', + 'buliding', + ], + 'buildings'=>[ + 'buiIdings', + 'bulidings', + ], + 'burning'=>'burining', + 'buses'=>'busses', + 'busing'=>'bussing', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_C.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_C.php index 7bbdd26..21b885a 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_C.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_C.php @@ -27,6 +27,240 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'cadaver'=>'cadavre', + + 'caliph'=>['calph',], + 'campaign'=>[ + 'camapaign', + 'camapign', + 'campain', + 'capaign', + ], + 'canadian'=>['canadain'], + 'casino'=>['casnio',], + 'cat purred'=>'catpurred', + 'category'=>['caragory',], + 'cavalry'=>['cavarly',], + 'cemetery'=>'cemetary', + 'central'=>'centarl', + 'centuries'=>'certuries', + 'century'=>'ceutury', + 'certain'=>'certian', + 'challenge'=>['challeng',], + 'championship'=>[ + 'champoinship', + ], + 'chaperoneship'=>[ + 'chaperonship', + ], + 'chapter'=>[ + 'chaper', + 'chpater', + ], + 'charge of'=>'chargeof', + 'cheerful'=>[ + 'chearful', + ], + 'chicanery'=>'chacinery', + 'chinese'=>[ + 'chinees', + 'chineese', + ], + 'chief'=>['cheif',], + 'chiefly'=>['cheifly',], + 'children'=>['childern', 'chlidren',], + 'church'=>[ + 'chucrh', + 'cuhrch', + 'cuhrntch', + ], + 'circuit'=>['circut',], + 'citation'=>['citaton',], + 'civilian'=>'civilain', + 'civilization'=>[ + 'civilsation', + 'civilzation', + ], + 'chaos'=>'choas', + 'college'=>'colege', + 'collegiate'=>'colegiate', + 'colonel'=>['colonal',], + 'colonial'=>[ + 'colonal', + 'colinial', + ], + 'columbian'=>'columban', + 'column'=>[ + 'colunm', + ], + 'combatants'=>'combattants', + 'combated'=>'combatted', + 'combating'=>[ + 'combatting', + ], + 'comrade'=>'com rade', + 'comrades'=>'com rades', + 'commented'=>['comented',], + 'commission'=>['comission', 'commision',], + 'commissioned'=>['comissioned', 'commisioned', 'commisssioned',], + 'commissioner'=>'commisioner', + 'committed'=>[ + 'commited', + 'committted', + ], + 'committee'=>'committeee', + 'common'=>[ + 'coommon', + 'cornmon', + ], + 'commonwealth'=>['comonwealth',], + 'communism'=>'comminism', + 'communist'=>['comunist',], + 'community'=>[ + 'comminity', + 'commuity', + ], + 'company'=>['compnay',], + 'compared'=>['compeared',], + 'complaint'=>['compalint',], + 'complaints'=>['compalints',], + 'conceive'=>['concieve',], + 'concrete'=>[ + 'concerte', + ], + 'concretely'=>[ + 'concertely', + ], + 'condition'=>['conditon',], + 'conditions'=>['conditons',], + 'conference'=>['conferenc', 'conferene',], + 'conflict'=>[ + 'confiict', + 'confilct', + 'confict', + 'conflect', + ], + 'congregation'=>['congergation',], + 'congress'=>[ + 'congerss', + ], + 'congresses'=>[ + 'congersses', + ], + 'congressional'=>[ + 'congerssional', + ], + 'connecting'=>'conecting', + 'connection'=>[ + 'connoction', + 'conoection', + ], + 'conquerer'=>['conqueor',], + 'conscious'=>[ + 'conciousn', + ], + 'consciousness'=>[ + 'conciousness', + 'consciousnesss', + ], + 'conscriptionist'=>'conscirptionist', + 'conscriptionists'=>'conscirptionists', + 'conservation'=>['conseration',], + 'considerable'=>'considerabel', + 'considerations'=>'considerotions', + 'consistent'=>['constitent',], + 'consistently'=>['consistantly', 'consitently',], + 'constituent'=>['constitent', 'constituint', 'constitutent'], + 'constituency'=>'constitency', + 'constituents'=>['constitents', 'constituints', 'constitutents'], + 'constitute'=>'constititute', + 'contact'=>'cotact', + 'constitution'=>['constititution',], + 'contained'=>['containned',], + 'contemporary'=>'contemprary', + 'continental'=>['continential',], + 'continued'=>'contiued', + 'continues'=>'contiues', + 'controversial'=>[ + 'controversal', + 'controvertial', + ], + 'cooperate'=>[ + 'co- operate', + 'co- oporate', + 'co-operate', + 'co-oporate', + ], + 'cooperate'=>[ + 'co- operated', + 'co- oporated', + 'co-operated', + 'co-oporated', + ], + 'cooperation'=>[ + 'co- operation', + 'co- oporation', + 'co-opera-tion', + 'co-operation', + 'co-oporation', + 'co-opera-ton', + 'co-operaton', + 'co-oporaton', + 'cooperaton', + ], + 'cooperative'=>[ + 'co- operative', + 'co- oporative', + 'co-operative', + 'co-oporative', + ], + 'cooperative'=>[ + 'co- operatives', + 'co- oporatives', + 'co-operatives', + 'co-oporatives', + ], + 'coordinate'=>[ + 'co- ordinate', + 'co-ordinate', + ], + 'coordinates'=>[ + 'co- ordinates', + 'co-ordinates', + ], + 'coordinating'=>[ + 'co- ordinating', + 'co-ordinating', + ], + 'coordination'=>[ + 'co- ordination', + 'co-ordination', + ], + 'conflict'=>[ + 'ocnflict', + ], + 'conflicts'=>[ + 'ocnflicts', + ], + 'corporate'=>'coporate', + 'corvee'=>'corve', + 'cosmopolitanism'=>'cosmopolitism', + 'country'=>'cuontry ', + 'create'=>[ + 'cerate', + 'craete', + ], + 'created'=>'cerated', + 'creating'=>'cerating', + 'creation'=>'ceration', + 'creationism'=>'cerationism', + 'creationist'=>'cerationist', + 'criteria'=>'criterions', + 'crystal-clear'=>'crystalclear', + 'cultural'=>'culutral', + 'cumulative'=>'culminative', + 'curious'=>['curous',], + 'current'=>'curernt', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_D.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_D.php index e9f853a..c9a8ac5 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_D.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_D.php @@ -27,6 +27,105 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'darkness'=>[ + 'dark ness', + 'darknes', + ], + 'days'=>'dayes', + 'days later'=>['days alter',], + 'debugging'=>['debuging',], + 'decided'=>'decidde', + 'declared'=>'decered', + 'decommissioned'=>'decommisioned', + 'decouple'=>[ + 'decuplate', + 'decuple', + ], + 'decoupling'=>[ + 'decuplating', + 'decupling', + ], + 'debt'=>'dobt', + 'deferring'=>[ + 'defering', + 'deffering', + ], + 'demonstration'=>['demonstartion',], + 'denomination'=>['denominaton',], + 'department'=>[ + 'depart- ment', + 'depart-ment', + ], + 'departments'=>[ + 'depart- ments', + 'depart-ments', + ], + 'dependence'=>[ + 'dependance', + ], + 'dependency'=>[ + 'dependancy', + ], + 'dependent'=>[ + 'dependant', + ], + 'dependents'=>[ + 'dependants', + ], + 'descendant'=>[ + 'descendent', + 'descentant', + ], + 'described'=>'descirbed', + 'design'=>'desgin', + 'dessert'=>'desssert', + 'destabilize'=>['destablize',], + 'destroyed'=>[ + 'destoryed', + ], + 'destroying'=>['destorying',], + 'detachment'=>'detachmment', + 'determined'=>[ + 'determinated', + 'deternmined', + ], + 'devastating'=>['devastatin',], + 'develop'=>'develope', + 'development'=>'developement', + 'dictator'=>[ + 'dicator', + ], + 'dictators'=>[ + 'dicators', + ], + 'different'=>['diferent', 'diferrent', 'diffeernt',], + 'difficult'=>'dificult', + 'difficulties'=>[ + 'difficultites', + ], + 'directory'=>'direcotyr', + 'disappears'=>['dissapears',], + 'disastrous'=>['disasterous',], + 'discouraged'=>'disencouraged', + 'discrepancies'=>['discrepencies',], + 'discrepancy'=>['discrepency',], + 'disillusioned'=>'disillusionized', + 'display'=>['dispaly',], + 'dispossessed'=>[ + 'disposessed', + 'dispossesed', + 'dispossesssed', + ], + 'dispossessing'=>'dispossesssing', + 'disturbances'=>['distrubances',], + 'diverse'=>[ + 'divers', + 'divrse', + ], + 'division'=>'divisoin', + 'domineer'=>['dominear',], + 'drive'=>['dirve',], + 'duplication'=>['duplicaiton',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_E.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_E.php index 662976a..63b9b95 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_E.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_E.php @@ -27,6 +27,118 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'early'=>'earely', + 'eastern'=>[ + 'eastearn', + 'easten', + ], + 'ecclesiastical'=>['eclesiastical',], + 'economic'=>'economis', + 'economical'=>'economial', + 'ecstasy'=>'ecstacy', + 'effective'=>[ + 'efective', + 'effetive', + ], + 'efficient'=>['eficient',], + 'effort'=>[ + 'ef- fort', + 'ef-fort', + 'efort', + ], + 'eightieth'=>'eighieth', + 'eighth'=>'eigth', + 'el dorado'=>'elderado', + 'elements'=>'elemenst', + 'embarrassing'=>[ + 'embarassing', + 'embarrasing', + ], + 'emissary'=>[ + 'emisary', + 'emmisary', + 'emmissary', + ], + 'emperor'=>['emporer',], + 'empire'=>['emprie,'], + 'employed'=>'employeed', + 'enclosure'=>['encolsure',], + 'endeavor'=>[ + 'endavour', + 'endeavnor', + ], + 'engagement'=>'engagment', + 'enlist'=>'enlift', + 'enlisted'=>'enlifted', + 'ensuing'=>'ensueing', + 'ensuring'=>'ensureing', + 'enthralled'=>'enthralledd', + 'entity'=>['enitity',], + 'entrepreneur'=>'entreprenuer', + 'equaly'=>['eqaul',], + 'equally'=>['eqaully',], + 'erected'=>'errected', + 'errors'=>[ + 'erors', + ], + 'erupted'=>'errupted', + 'espionage'=>[ + 'espoinage', + 'esponage', + 'esponiage', + ], + 'establishment'=>'establishme', + 'ethereal'=>'etherial', + 'evening'=>'evining', + 'everybody'=>[ + 'every body', + 'every-body', + 'everbody', + 'everyboyd', + ], + 'everyone'=>[ + 'every one', + 'every-one', + ], + 'evident'=>'evedent', + 'evil'=>'evol', + 'excellent'=>'excelent', + 'excessive'=>[ + 'excesssive', + ], + 'exchange'=>[ + 'exchnage', + ], + 'executive'=>[ + 'exective', + ], + 'exercise'=>[ + 'excercise', + 'exercize', + ], + 'exfoliate'=>[ + 'exfolliate', + ], + 'exhibition'=>[ + 'exhibiton', + 'exibition', + ], + 'existence'=>[ + 'existance', + ], + 'expectation'=>[ + 'expection', + ], + 'expense'=>'expence', + 'exploit'=>'exuloit', + 'exploitation'=>'exuloitation', + 'exploiter'=>'exuloiter', + 'exploiting'=>'exuloiting', + 'expressely'=>[ + 'expressedly', + 'expressely', + ], + 'extracted'=>'exctracted', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_F.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_F.php index b2548ff..435abe9 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_F.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_F.php @@ -27,6 +27,71 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'fairly'=>['afairly',], + 'falafel'=>'falafal', + 'familiar'=>'familliar', + 'famous'=>'fomous', + 'far-reaching'=>'farreaching', + 'feared'=>'feard', + 'features'=>'featurs', + 'fervent'=>'ferevent', + 'fictitious'=>'fictious', + 'fields'=>'fileds', + 'fight'=>['figth',], + 'financier'=>'finacier', + 'fire-breathing'=>'firebreathing', + 'first'=>['firts',], + 'fizzling'=>'fizziling', + 'flotation'=>['floatation',], + 'flotilla'=>['floatilla',], + 'flotillas'=>['floatillas',], + 'flourishing'=>'florishing', + 'followed'=>['follewed',], + 'foolish'=>'oolish', + 'for the'=>[ + 'fo the', + 'forthe', + 'fro the', + 'ofr the' + ], + 'forces'=>'focres', + 'foreseen'=>[ + 'forseen', + ], + 'former'=>[ + 'brmer', + ], + 'forswear'=>'foreswear', + 'forthwith'=>'fortwith', + 'four'=>'foru', + 'franchise'=>'francihse', + 'frankfurt'=>'frankfart', + 'french'=>[ + 'frecnh', + 'frenc', + ], + 'friendship'=>'firendship', + 'from'=>['frrom',], + 'from a'=>['fom a',], + 'from an'=>['fom an',], + 'from the'=>[ + 'fom the', + 'from th', + ], + 'froze'=>['frozed',], + 'fruit-flies'=>'fruitflies', + 'frustrated'=>'frustated', + 'fulfill'=>[ + 'fulfil', + 'fullfill', + ], + 'fullness'=>'fulness', + 'further'=>'futher', + 'furthermore'=>[ + 'farthermore', + 'furthemore', + 'furthrmore', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_G.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_G.php index 8848921..bf158d0 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_G.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_G.php @@ -27,6 +27,65 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'galapogos'=>'galopogos', + 'gallant'=>['galliant',], + 'Galileo'=>['Gallileo',], + 'gathering'=>'gethering', + 'gauge'=>['guage',], + 'geminiani'=>['geminani',], + 'generally'=>[ + 'generelly', + 'genrally', + ], + 'German'=>['Geramn',], + 'gesture'=>'gseture', + 'getting'=>['gettng',], + 'global'=>['globial',], + 'globalization'=>['globlization',], + 'goddess'=>['goddes', 'godess',], + 'government'=>[ + 'goverment', + 'governement', + 'governemnt', + 'governemt', + 'governent', + 'governmen', + 'governmet', + 'govrenment', + ], + 'grammatical'=>'gramatical', + 'great'=>'gerat', + 'grecian'=>['greecian',], + 'grievance'=>[ + 'greivance', + 'greviance', + 'grivance', + ], + 'grievously'=>[ + 'greivously', + 'greviously', + 'grivously', + ], + 'ground-based'=>[ + 'ground based', + ], + 'group'=>'gorup', + 'groups'=>'gorups', + 'guerrilla'=>[ + 'guerrala', + 'guerralla', + 'guerilla', + 'guerrila', + 'guerrilal', + ], + 'guerrillas'=>[ + 'guerillas', + 'guerralas', + 'guerrallas', + 'guerrilals', + 'guerrilas', + ], + 'gymnastics'=>['gymastics', 'gynmastics',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_H.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_H.php index 122b326..d566a8e 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_H.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_H.php @@ -27,6 +27,27 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'hamlet'=>'hamlit', + 'harassment'=>['harssment',], + 'having'=>'haveing', + 'he'=>'he he', + 'headquarters'=>'headquerters', + 'heightening'=>'hightening', + 'hidden'=>['hideen',], + 'highlands'=>'higlands', + 'highway'=>'higllway', + 'hindu'=>'hindoo', + 'hindus'=>'hindoos', + 'hindrance'=>'hinderance', + 'hindrances'=>'hinderances', + 'honor'=>['honord',], + 'honored'=>['honord',], + 'horrendous'=>'horendous', + 'hospital'=>'hopsital', + 'how'=>['how how',], + 'humorously'=>['humourously',], + 'Hungarian'=>['Hungaran',], + 'hypocritical'=>['hyprocritical',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_I.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_I.php index f4635c5..9de2255 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_I.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_I.php @@ -27,6 +27,80 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'identity'=>['idenity',], + 'illustrated'=>'ilustrated', + 'immediately'=>[ + '1mmediately', + 'inmediately', + 'lmmediately', + ], + 'immense'=>'imemnse', + 'immersed'=>['immeresed',], + 'immigrant'=>['imigrant',], + 'immigration'=>['imigration',], + 'implementation'=>['implementatation',], + 'important'=>'importent', + 'in addition'=>['in additon',], + 'in order'=>'inorder', + 'in that'=>'inthat', + 'in the'=>['int he',], + 'incipient'=>['incipent',], + 'inconsistent'=>'inconsisent', + 'independence'=>[ + 'indepedence', + 'independance', + 'independenec', + 'indepenedence', + 'indepndence', + ], + 'independent'=>[ + 'indepedent', + 'independant', + 'indepenedent', + 'indepndent', + ], + 'indispensable'=>'indispensible', + 'industrial'=>'industiral', + 'industry'=>['indsutry',], + 'infection'=>['infecion',], + 'influence'=>['infuence',], + 'influential'=>['infuential'], + 'initially'=>['intially',], + 'innovation'=>'innovaton', + 'inoculate'=>['inocolate',], + 'inquisition'=>['inquisiton',], + 'inside the'=>'insidethe', + 'insistence'=>'insistance', + 'instantiation'=>['instatiation',], + 'instead'=>['instaed', 'isntead',], + 'institute'=>[ + 'instititute', + 'instute', + ], + 'institution'=>['instititution', 'instution',], + 'instruction'=>['instrution',], + 'insurrection'=>'insurection', + 'intellectual'=>['intellectul', 'intelletual',], + 'intercourse'=>'intercouse', + 'interrupted'=>'interupted', + 'interested'=>'inteersted', + 'interests'=>'inteersts', + 'intermittent'=>['intermitent',], + 'international'=>[ + 'internaitonal', + 'interanational', + ], + 'internationalism'=>[ + 'internaitonalism', + 'interanationalism', + ], + 'intriguing'=>['intriuing',], + 'invaded'=>'invadid', + 'involving'=>['invokving',], + 'iranian'=>'irannian', + 'irreconcilable'=>'irreconcileable', + 'it'=>'lt', + 'italian'=>'itailan', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_J.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_J.php index 4f3ce41..9bc18fc 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_J.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_J.php @@ -27,6 +27,23 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'japanese'=>[ + 'japaneese', + 'japanes', + ], + 'job hunting'=>[ + 'jobhunting', + ], + 'joined'=>[ + 'joinde', + ], + 'jordanian'=>[ + 'jordianian', + 'jordnian', + ], + 'june'=>[ + 'jime', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_K.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_K.php index 8bea99e..2633620 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_K.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_K.php @@ -27,6 +27,14 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'knowledge'=>[ + 'knoweldge', + 'knowlege', + ], + 'kropotkin'=>[ + 'kroptkin', + 'kroptokin', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_L.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_L.php index 2fbd0f1..13e7957 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_L.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_L.php @@ -27,6 +27,55 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'lamennais'=>[ + 'lamenais', + ], + 'lamp post'=>[ + 'lampost', + 'lamppost', + ], + 'lamp posts'=>[ + 'lamposts', + 'lampposts', + ], + 'language'=>[ + 'langauge', + ], + 'languages'=>[ + 'langauges', + ], + 'later on'=>[ + 'alter on', + ], + 'lawyer'=>[ + 'lawyre', + ], + 'legislative'=>[ + 'legilative', + ], + 'legitimist'=>[ + 'legimist', + ], + 'library'=>[ + 'libarry', + 'libary', + ], + 'lieutenant'=>[ + 'leiutenant', + 'leuitenant', + 'liuetenant', + ], + 'light'=>[ + 'Iight', + ], + 'looking'=>[ + 'loking', + ], + 'london'=>'lond', + 'long'=>'iong', + 'longing'=>'ionging', + 'longs'=>'iongs', + 'lucky'=>'lukcy', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_M.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_M.php index 8c43e28..b3b30ff 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_M.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_M.php @@ -27,6 +27,79 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'macadamia'=>['macademia',], + 'mainland'=>['mainlaind',], + 'maize'=>'maise', + 'maneuvering'=>'manoeuvering', + 'manifestation'=>[ + 'manfestation', + 'manifestaton', + ], + 'manifestations'=>[ + 'manfestations', + 'manifetations', + ], + 'manifestos'=>'manifestoes', + 'mankind'=>'mandkind', + 'manner'=>[ + 'maner', + ], + 'Marie'=>['Mariie',], + 'married'=>'maried', + 'Marseillaise'=>'Mareseillaise', + 'material'=>'mateiral', + 'materials'=>'mateirals', + 'mathematics'=>['mathmatics',], + 'may'=>['maye',], + 'measure'=>[ + 'measuer', + 'meaure', + ], + 'measures'=>[ + 'measuers', + 'meaures', + ], + 'mechanism'=>'machanism', + 'Mediterranean'=>['Mediteranean',], + 'meeting'=>'metting', + 'member'=>['meber', 'memebr',], + 'mercenary'=>'mercenray', + 'merchant'=>['merchat',], + 'meshed'=>'meshod', + 'messaging'=>['messeging',], + 'messianism'=>'mesianism', + 'militant'=>'miltant', + 'militants'=>'miltants', + 'military'=>'militay', + 'militia'=>['milita',], + 'military'=>[ + 'militaly', + 'militiary', + ], + 'millennial'=>[ + 'milennial', + 'millenial', + ], + 'millennials'=>[ + 'milennials', + 'millenials', + ], + 'millennium'=>[ + 'milennium', + 'millenium', + ], + 'millimeter'=>['milllimeter',], + 'mineral'=>['minerial',], + 'months'=>'motnhs', + 'moreover'=>['morever','morovor',], + 'moroccan'=>['morroccan', 'morrocan',], + 'mountainous'=>['mountaineous',], + 'municipal'=>[ + 'municiple', + 'municipial', + ], + 'municipality'=>['municpality',], + 'mutiny'=>['mutny'], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_N.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_N.php index 13410fd..2e8be91 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_N.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_N.php @@ -27,6 +27,37 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'namely'=>['namelly',], + 'national'=>[ + 'naitonal', + 'nationnal', + ], + 'nationwide'=>[ + 'naitonwide', + 'nationnwide', + ], + 'necessary'=>['nesessary', 'nessecary',], + 'necessity'=>[ + 'neccesity', + 'necessaty', + ], + 'necessities'=>[ + 'neccesities', + 'necessaties', + ], + 'neighborhood'=>'neightbourhood', + 'new'=>['neww',], + 'newws'=>['newws',], + 'nietzsche'=>['nietzche', 'nietzshe',], + 'nobody'=>[ + 'no body', + 'no-body', + ], + 'nonplussed'=>'non-plussed', + 'notably'=>'noteably', + 'Novgorod'=>['Novgord', 'Novgrod',], + 'now he'=>['nowh e',], + 'nowadays'=>['nowdays',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_O.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_O.php index 357d284..e631953 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_O.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_O.php @@ -27,6 +27,54 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'Oaxaca'=>'Oaxac', + 'obligatory'=>'obligatoty', + 'ocean-based'=>['ocean based',], + 'October'=>[ + 'Ocotober', + 'Octeber', + 'Octtober', + ], + 'of'=>[ + 'of of', + ], + 'of the'=>['fo the', 'ofthe',], + 'of their'=>['oftheir',], + 'officer'=>'officier', + 'officers'=>'officiers', + 'okhrana'=>['okrana',], + 'openly'=>['openely',], + 'operations'=>['operatons',], + 'opossum'=>'opposum', + 'opportunities'=>[ + 'opportuinities', + 'opportunites', + ], + 'opportunity'=>[ + 'opportuinity', + 'opportunitey', + ], + 'oppression'=>[ + 'oppresion', + 'opresion', + 'opression', + ], + 'or'=>[ + 'lor', + ], + 'orbital'=>['oribital',], + 'ordinance'=>['ordience',], + 'organization'=>[ + 'organizaton', + ], + 'organizations'=>[ + 'organizatons', + ], + 'original'=>['origial',], + 'originally'=>['origially', 'originaly',], + 'other hand'=>'otherhand', + 'others'=>['tohers',], + 'overwhelmed'=>['overwhemed', 'overwelmed',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_P.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_P.php index 0158185..4f4b866 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_P.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_P.php @@ -27,6 +27,117 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'pamphlet'=>[ + 'pamphelt', + ], + 'pamphlets'=>[ + 'pamphelts', + ], + 'papal'=>['papl',], + 'paramount'=>['paramout',], + 'parliamentary'=>['parliamentry',], + 'passenger'=>['passenegr',], + 'partisan'=>[ + 'partizan', + 'patisan', + ], + 'partisans'=>[ + 'partizans', + 'patisans', + ], + 'pattern'=>'patern', + 'peasant'=>['paesant', 'peasent',], + 'peasants'=>['peasents',], + 'peasantry'=>[ + 'peasentry', + 'peasanty', + ], + 'pentium'=>['pentum',], + 'people'=>'peolpe', + 'perceive'=>['percieve',], + 'perceiving'=>['percieving',], + 'percent'=>['per cent',], + 'persistently'=>'persisently', + 'personnel'=>'personel', + 'peruvian'=>'peruvan', + 'philanthropist'=>['philantropist',], + 'philanthropists'=>['philantropists',], + 'piece of'=>['piece fo',], + 'plebiscite'=>'plebinite', + 'poem'=>[ + 'pem', + ], + 'poet-philosopher'=>'poetphilosopher', + 'poisoning'=>['poisining',], + 'political'=>['pollitical',], + 'politician'=>['politican',], + 'politicians'=>['politicans',], + 'poorest'=>['porest',], + 'portray'=>'potray', + 'portrayed'=>'potrayed', + 'portraying'=>'potraying', + 'possession'=>[ + 'posession', + 'possesion', + ], + 'potential'=>['potental',], + 'practically'=>[ + 'prac- tically', + 'prac-tically', + ], + 'precisely'=>'precizely', + 'preeminence'=>['preminence'], + 'preemption'=>'pre-emption', + 'preordained'=>'pre-ordained', + 'preparations'=>['preperations', 'preprations',], + 'prerogative'=>'perogative', + 'present'=>'persent', + 'preserve'=>'perserve', + 'presumption'=>['presumpion',], + 'presumptious'=>'presumtuous', + 'presumptive'=>'presumtive', + 'pretension'=>['pretention',], + 'pretensions'=>['pretentions',], + 'principles'=>['prinicples',], + 'privately'=>['privatey',], + 'privileged'=>[ + 'priveleged', + 'privilegd', + 'priviledged', + ], + 'privileges'=>[ + 'priveleges', + 'privilegs', + 'priviledges', + ], + 'proclamation'=>[ + 'procla- mation', + 'procla-mation', + 'proclimation', + ], + 'proclamations'=>[ + 'procla- mations', + 'procla-mations', + 'proclimations', + ], + 'proclaiming'=>'proclaim ing', + 'progressively'=>['progresively',], + 'proletariat'=>'proletariate', + 'promise'=>'promize', + 'propagate'=>['propogate',], + 'propagation'=>['propogation',], + 'property'=>['porperty', 'proprety',], + 'prophesied'=>'prophecied', + 'province'=>'prov- ince', + 'prussia'=>'prusssia', + 'pulse-beat'=>'pulsebeat', + 'public'=>['publuc',], + 'puppet'=>['pupet',], + 'putsch'=>[ + 'putch', + 'putcsh', + 'putsh', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Q.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Q.php index bb10323..b76f08f 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Q.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Q.php @@ -27,6 +27,8 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'qualified'=>['qualifiyed',], + 'qualifying'=>['qualifiying',], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_R.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_R.php index 2f23075..57cd499 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_R.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_R.php @@ -27,6 +27,100 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'railway'=>'railwaye', + 'rapidly'=>['rapidy',], + 'reason'=>['reaon',], + 'reasons'=>['reaons',], + 'rebuilding'=>['rebulding',], + 'receive'=>[ + 'receve', + 'recieve', + 'recive', + ], + 'received'=>[ + 'receved', + 'recieved', + 'recived', + ], + 'receiving'=>[ + 'receving', + 'recieving', + ], + 'recognize'=>'recoginise', + 'recruiting'=>['recruting',], + 'reform-minded'=>['reform minded',], + 'region'=>['reigon',], + 'regional'=>['regionial',], + 'reinforcement'=>'reenforcement', + 'release'=>['relesae',], + 'released'=>[ + 'relaesed', + 'relesaed', + ], + 'remaining'=>['remainin',], + 'repossession'=>['repossetion',], + 'represented'=>[ + 'repersented', + 'repersented', + ], + 'representing'=>[ + 'repersenting', + ], + 'represents'=>[ + 'repersents', + 'represesnt', + ], + 'republic'=>['repulic',], + 'repudiate'=>['repudate',], + 'repudiating'=>['repudating',], + 'requisition'=>['requisiton',], + 'requisitioned'=>['requisitoned',], + 'resentment'=>['resenment',], + 'rescind'=>['resind',], + 'respect'=>'repect', + 'respected'=>'repected', + 'respecting'=>'repecting', + 'restrict'=>['resrtict',], + 'restricts'=>['resrticts',], + 'restriction'=>['resrtiction',], + 'restrictions'=>['resrtictions',], + 'resume'=>[ + 'reassume', + ], + 'resumes'=>[ + 'reassumes', + ], + 'resulting'=>[ + 'resuIting', + 'reulting', + ], + 'results'=>[ + 'resuIts', + 'reults', + ], + 'retreated'=>['retreatde',], + 'reveling'=>'reveling', + 'reverberation'=>[ + 'reveberation', + 'reverbration', + ], + 'revolution'=>[ + 'revoulution', + ], + 'revolutionary'=>[ + 'revolu- tionary', + 'revolu-tionary', + 'revolutionay', + ], + 'revolutionize'=>['revolustionise',], + 'rights'=>[ + 'irghts', + ], + 'ruinous'=>['runious',], + 'russian'=>[ + 'rusian', + 'russsian', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_S.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_S.php index 0502f2b..0cabcb5 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_S.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_S.php @@ -27,6 +27,133 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'safeguard'=>[ + 'safegard', + ], + 'safe'=>[ + 'sefe', + ], + 'safely'=>[ + 'sefely', + ], + 'sanitarium'=>['sanitarum',], + 'sanitation'=>['saniation', 'sanitaion', 'sanitaton',], + 'sauce'=>['suace',], + 'school'=>['schcool',], + 'schedule'=>['shedule',], + 'scheduled'=>'cheluded', + 'schopenhauer'=>['shopenhauer', 'schopenhaur',], + 'scorch'=>['scortch',], + 'scorched'=>['scortched',], + 'sea-based'=>['sea based',], + 'section'=>[ + 'sectino', + 'setion', + ], + 'security'=>['secuirty',], + 'sedition'=>['sediton',], + 'seize'=>['sieze',], + 'seized'=>['siezed',], + 'self'=>['selv',], + 'separated'=>['sepatated',], + 'shall be'=>'shallbe', + 'she'=>'she she', + 'she is'=>['sheis',], + 'shelter'=>[ + 'sllelter', + ], + 'sicilian'=>['sicilan',], + 'significant'=>'signifigant', + 'similar'=>['similiar', 'simmilar',], + 'simulateously'=>['simultanously',], + 'sister'=>['sistor',], + 'socialization'=>['socialisastion',], + 'somewhat'=>['somwhat',], + 'sorghum'=>['sorgham',], + 'sought'=>'sollght', + 'souvenir'=>['souvenier',], + 'sovereign'=>['soveriegn',], + 'sovereigns'=>['soveriegns',], + 'soybean'=>['soyabean',], + 'spanish'=>[ + 'spainish', + 'spanis', + ], + 'spell out'=>'spellout', + 'spiritually'=>['spirtually ', 'spritually',], + 'spontaneously'=>['spontaneosly',], + 'st. petersburg'=>[ + 'st. petersberg', + 'st. petersburgh', + ], + 'stablize'=>'estabilize', + 'stablized'=>'estabilized', + 'stablizes'=>'estabilizes', + 'stands'=>['stansd',], + 'status quo'=>['statu quo',], + 'sterilization'=>['sterilzation',], + 'still'=>'stlil', + 'stoical'=>'soical', + 'Strasbourg'=>['Strabourg',], + 'strengthen'=>[ + 'stengthen', + 'sterngth', + ], + 'strengthened'=>[ + 'stengthened', + 'sterngthened', + ], + 'strike'=>['stirke',], + 'strikes'=>['stirkes',], + 'struggle'=>'strugle', + 'struggler'=>'strugler', + 'struggling'=>'strugling', + 'students'=>['stuednts',], + 'subjects'=>['subcjects',], + 'subscribe'=>'subcribe', + 'subscriber'=>'subcriber', + 'subscribers'=>'subcribers', + 'subscription'=>'subcription', + 'subsistence'=>'susbsistence', + 'substitute'=>['substititute',], + 'substitution'=>['substititution',], + 'subtly'=>[ + 'subtlely', + 'subtley', + ], + 'suburban'=>['suburbian',], + 'succeeded'=>['succeded', 'succeedded', 'suceeded',], + 'succeeding'=>['succeding', 'succeding', 'suceeding',], + 'succession'=>'sucession', + 'sufficient'=>['sufficent',], + 'sufficiently'=>['sufficently',], + 'suffolk'=>'sufolk', + 'sugarcane'=>['sugercane',], + 'superintendent'=>'superintendant', + 'supernumerary'=>'supernumary', + 'superseded'=>['superceeded', 'superceded', 'superseeded',], + 'support'=>['suppoort',], + 'supporters'=>['supportes',], + 'supports'=>['supportes',], + 'suppressed'=>['suppresed', 'supressed',], + 'symbolize'=>'symoblolize', + 'symbolized'=>'symoblolized', + 'symmetry'=>[ + 'simetry', + 'symetry', + ], + 'symmetric'=>[ + 'simetric', + 'symetric', + ], + 'symmetrical'=>[ + 'simetrical', + 'symetrical', + ], + 'synthesize'=>[ + 'synthetise', + 'synthetize', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_T.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_T.php index 7227c98..1047f11 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_T.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_T.php @@ -27,6 +27,63 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'taken'=>['takn','takne',], + 'technique'=>['techique', 'techniqu',], + 'television'=>['televison', 'telivision',], + 'that'=>[ + 'tbat', + 'thot', + ], + 'that are'=>'thet are', + 'the'=>[ + 'hthe', + 'tbe', + 'the the', + 'tlie', + 'tthe', + ], + 'the large'=>['thelarge',], + 'the legal'=>'thelegal', + 'the new'=>['thenew',], + 'the other'=>'tho other', + 'their'=>['tehir',], + 'they'=>['tliey',], + 'thirteen'=>'thirteeen', + 'tibetan'=>'thibetan', + 'times'=>'timees', + 'thievish'=>'theivish', + 'this'=>'tihs', + 'thorougly'=>['thorougly',], + 'those'=>[ + 'thiose', + 'thosse', + ], + 'though'=>['though though',], + 'thoughts'=>['thoughs',], + 'threshold'=>'thresold', + 'throughout'=>['troughout',], + 'to a'=>'ot a', + 'to the'=>[ + 'ot the', + 'to tho', + 'tothe', + ], + 'tolkien'=>['tolkein',], + 'town'=>['twon',], + 'trader'=>['traider',], + 'traditional'=>['tradional',], + 'traditionalism'=>['tradionalism',], + 'traditionally'=>['traditonally', 'tradionally',], + 'transferring'=>'transfering', + 'transgender'=>['transgneder',], + 'translation'=>['trnaslation',], + 'transportation'=>['transporation',], + 'travel'=>'TraveI', + 'travels'=>'TraveIs', + 'trouble'=>'trobule', + 'trustworthy'=>'trustwortby', + 'tsunami'=>['tsuname',], + 'tunnel-disease'=>'tunneldisease', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_U.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_U.php index e69c681..8cbd0e4 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_U.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_U.php @@ -27,6 +27,23 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'undertook'=>['undertok',], + 'unexpectedly'=>['unexpectadly',], + 'unforeseen'=>['unforseen',], + 'uninterrupted'=>'uninterupted', + 'united'=>[ + 'unitesd', + 'unitd', + ], + 'united states'=>[ + 'unitd states', + 'united staes', + 'united stats', + ], + 'universities'=>['univerisities',], + 'unmanageable'=>'umnanageable', + 'unmistakable'=>'unmistakeable', + 'upon'=>'apon', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_V.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_V.php index 06b17f4..cda95fd 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_V.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_V.php @@ -27,6 +27,17 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'various'=>[ + 'varoius', + 'varous', + ], + 'vegetables'=>['vegeatables',], + 'vice-minister'=>'viceminister', + 'Vietnamese'=>['Vietnames',], + 'vigorous'=>'vigourous', + 'virginia'=>'virgina', + 'vladivostok'=>['vladivostock', 'vladovostock',], + 'volunteers'=>'volimteers', ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_W.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_W.php index 0227c32..7dd10ca 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_W.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_W.php @@ -27,6 +27,72 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'wage worker'=>[ + 'wageworker', + ], + 'way'=>[ + 'waye', + ], + 'ways'=>[ + 'wayes', + ], + 'wealth'=>[ + 'weaIth', + ], + 'wealthy'=>[ + 'weaIthy', + ], + 'wearing'=>'wearilig', + 'well'=>[ + 'we11', + 'we1l', + 'wel1', + ], + 'well conceived'=>'wellconceived', + 'well known'=>'wellknown', + 'wheat'=>[ + 'wheet', + ], + 'where'=>[ + 'where where', + ], + 'which'=>[ + 'which which', + ], + 'wholesome'=>'wholsome', + 'wholesomeness'=>'wholsomeness', + 'widespread'=>[ + 'widesperead', + ], + 'wisdom'=>[ + 'wisom', + ], + 'with the'=>[ + 'withthe', + ], + 'withhold'=>[ + 'withold', + ], + 'with'=>'uith', + 'without'=>[ + 'withotu', + ], + 'woeful'=>'woful', + 'wondrous'=>[ + 'wonderous', + ], + 'working classes'=>[ + 'workingclasses', + ], + 'worldly'=>[ + 'wordly', + ], + 'worm-eaten'=>[ + 'wormeaten', + ], + 'would'=>[ + 'wouid', + ], ]; } } diff --git a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Y.php b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Y.php index 7ed2081..e04716f 100644 --- a/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Y.php +++ b/classes/Language/Words/EnglishMisspellings/EnglishMisspellingsWords_Y.php @@ -27,6 +27,18 @@ public function __construct($args) { public function EnglishMisspellingsWords() { return [ + 'yahoo'=>[ + 'yahhoo', + ], + 'year'=>[ + 'yera', + ], + 'years'=>[ + 'yeras', + ], + 'yield'=>[ + 'yeild', + ], ]; } } diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_0.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_0.php new file mode 100644 index 0000000..fe66b2a --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_0.php @@ -0,0 +1,138 @@ +EnglishMisspellingsWords_dynamicData(); + $static_misspellings = $this->EnglishMisspellingsWords_staticData(); + + $misspellings = []; + + foreach($dynamic_misspellings as $word => $misspelling) { + if(!$misspellings[$word]) { + $misspellings[$word] = []; + } + $misspellings[$word] = array_merge($misspellings[$word], $misspelling); + } + + foreach($static_misspellings as $word => $misspelling) { + if(!$misspellings[$word]) { + $misspellings[$word] = []; + } + $misspellings[$word] = array_merge($misspellings[$word], $misspelling); + } + + #print("
");
+		#	print_r($misspellings);
+		#	print("
"); + + return $misspellings; + } + + public function EnglishMisspellingsWords_dynamicData() { + $misspellings = []; + + $skip = [ + 'i.e', + ]; + + $left_space_misspelling_hash = [ + ',', + '.', + ')', + ]; + + $right_space_misspelling_hash = [ + '(', + ]; + + $alphas = range('a', 'z'); + $alphas = array_merge($alphas, range('0', '9')); + + foreach($left_space_misspelling_hash as $char) { + foreach($alphas as $alpha) { + $correct_string = $char . ' ' . $alpha; + $incorrect_string = $char . $alpha; + + if($char == '.') { + $incorrect_string = '[^A-Z0-1]' . $incorrect_string; + } + + if(!$misspellings[$correct_string]) { + $misspellings[$correct_string] = []; + } + + $misspellings[$correct_string][] = $incorrect_string; + } + } + + foreach($right_space_misspelling_hash as $char) { + foreach($alphas as $alpha) { + $correct_string = $alpha . ' ' . $char; + $incorrect_string = $alpha . $char; + + if(!$misspellings[$correct_string]) { + $misspellings[$correct_string] = []; + } + + $misspellings[$correct_string][] = $incorrect_string; + } + } + + return $misspellings; + } + + public function EnglishMisspellingsWords_staticData() { + return [ + ','=>[ + ' ,', + ',,', + ], + '.'=>[ + ' .', + ], + '!'=>[ + ' !', + ], + '?'=>[ + ' ?', + ], + '--'=>[ + '---', + '----', + '-----', + '------', + '-------', + '--------', + '[a-z0-9]--[a-z0-9]', + '[a-z0-9]- ', + ' -[a-z0-9]', + ], + ]; + } + } + +?> \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_A.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_A.php new file mode 100644 index 0000000..c7f0ed3 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_A.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_B.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_B.php new file mode 100644 index 0000000..88c5951 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_B.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_C.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_C.php new file mode 100644 index 0000000..64cf5f2 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_C.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_D.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_D.php new file mode 100644 index 0000000..ed538d5 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_D.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_E.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_E.php new file mode 100644 index 0000000..f903573 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_E.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_F.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_F.php new file mode 100644 index 0000000..daf1c2e --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_F.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_G.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_G.php new file mode 100644 index 0000000..55de9bd --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_G.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_H.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_H.php new file mode 100644 index 0000000..f17e209 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_H.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_I.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_I.php new file mode 100644 index 0000000..e161111 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_I.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_J.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_J.php new file mode 100644 index 0000000..a212d6c --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_J.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_K.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_K.php new file mode 100644 index 0000000..2e152d3 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_K.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_L.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_L.php new file mode 100644 index 0000000..80735b3 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_L.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_M.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_M.php new file mode 100644 index 0000000..b0261cc --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_M.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_N.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_N.php new file mode 100644 index 0000000..cf48a62 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_N.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_O.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_O.php new file mode 100644 index 0000000..7330051 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_O.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_P.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_P.php new file mode 100644 index 0000000..82aa3e9 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_P.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Q.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Q.php new file mode 100644 index 0000000..5a532c4 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Q.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_R.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_R.php new file mode 100644 index 0000000..c44783a --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_R.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_S.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_S.php new file mode 100644 index 0000000..9462494 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_S.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_T.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_T.php new file mode 100644 index 0000000..91e4156 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_T.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_U.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_U.php new file mode 100644 index 0000000..cc4dc98 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_U.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_V.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_V.php new file mode 100644 index 0000000..b4f488f --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_V.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_W.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_W.php new file mode 100644 index 0000000..65ce318 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_W.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_X.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_X.php new file mode 100644 index 0000000..5343094 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_X.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Y.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Y.php new file mode 100644 index 0000000..13775ff --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Y.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Z.php b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Z.php new file mode 100644 index 0000000..0a2a582 --- /dev/null +++ b/classes/Language/Words/IntensiveEnglishMisspellings/IntensiveEnglishMisspellingsWords_Z.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/classes/Networking/Cookie.php b/classes/Networking/Cookie.php index be5d3c0..58e8761 100644 --- a/classes/Networking/Cookie.php +++ b/classes/Networking/Cookie.php @@ -1,60 +1,52 @@ domain = $args[domain]; $this->time = $args[time]; $this->cleanser = $args[cleanser]; - $this->cookie = array(); - foreach ($_COOKIE as $cookie_key => $cookie_value) - { - $cleanser_args = array( + $this->cookie = []; + foreach ($_COOKIE as $cookie_key => $cookie_value) { + $cleanser_args = [ 'input'=>$cookie_key, - ); + ]; - $cleansed_key = $this->cleanser->CleanseInput_EscapeBitVariableChars($cleanse_input_utf8_args)[cleansedinput]; + $cleansed_key = $this->cleanser->CleanseInput_EscapeBitVariableChars($cleanse_input_utf8_args)['cleansedinput']; - $cleanser_args = array( + $cleanser_args = [ 'input'=>$cookie_value, - ); + ]; - $cleansed_value = $this->cleanser->CleanseInput_EscapeBitVariableChars($cleanse_input_utf8_args)[cleansedinput]; + $cleansed_value = $this->cleanser->CleanseInput_EscapeBitVariableChars($cleanse_input_utf8_args)['cleansedinput']; $this->cookie[$cleansed_key] = $cleansed_value; } $this->cookie = $_COOKIE; + + return TRUE; } - public function SetCookie($args) - { - $cookie_key = $args[key]; - $cookie_value = $args[value]; - $secure = $args[secure]; + public function SetCookie($args) { + $cookie_key = $args['key']; + $cookie_value = $args['value']; + $secure = $args['secure']; + $permanent = $args['permanent']; - if(isset($cookie_value)) - { - if(!$secure) - { - $secure = FALSE; - $cookie_time = $this->InsecureCookieExpirationTime(); - } - else - { - $cookie_time = $this->SecureCookieExpirationTime(); + if(isset($cookie_value)) { + if(!$secure && !$permanent) { + $cookie_time = $this->TemporaryCookieExpirationTime(); + } else { + $cookie_time = $this->PermanentCookieExpirationTime(); } - } - else - { + } else { $cookie_time = $this->DeleteCookieExpirationTime(); } @@ -67,36 +59,32 @@ public function SetCookie($args) $secure, $this->CookieHTTPOnlyOption() ); + + return TRUE; } - public function GetCookie($args) - { - $cookie_key = $args[cookie]; + public function GetCookie($args) { + $cookie_key = $args['cookie']; return $this->cookie[$cookie_key]; } - public function SecureCookieExpirationTime() - { - return $this->time->time + (4* 60 * 60); + public function PermanentCookieExpirationTime() { + return $this->time->time + (10 * 365 * 24 * 60 * 60); } - public function InsecureCookieExpirationTime() - { - return $this->time->time + (10 * 365 * 24 * 60 * 60); + public function TemporaryCookieExpirationTime() { + return $this->time->time + (4* 60 * 60); } - public function DeleteCookieExpirationTime() - { + public function DeleteCookieExpirationTime() { return (-1) * ($this->time->time + (10 * 365 * 24 * 60 * 60)); } - public function CookiePath() - { + public function CookiePath() { return '/'; } - public function CookieHTTPOnlyOption() - { + public function CookieHTTPOnlyOption() { return FALSE; } } diff --git a/classes/Networking/Domain.php b/classes/Networking/Domain.php index 9782dbc..e5673f3 100644 --- a/classes/Networking/Domain.php +++ b/classes/Networking/Domain.php @@ -49,13 +49,13 @@ public function GetPrimaryDomain($args) { $primary_domain .= 'http://'; } - if($args[www]) { + if($args['www']) { $primary_domain .= 'www.'; } - if($args[domain]) { + if($args['domain']) { $primary_domain .= $args['domain']; - } elseif($args[lowercased] || $args['lowercase']) { + } elseif($args['lowercased'] || $args['lowercase']) { $primary_domain .= $this->primary_domain_lowercased; } else { $primary_domain .= $this->primary_domain; diff --git a/classes/Networking/Handler.php b/classes/Networking/Handler.php index f4c81f3..04f8ff8 100644 --- a/classes/Networking/Handler.php +++ b/classes/Networking/Handler.php @@ -1,7 +1,6 @@ Construct_PresetAuthentication(); $this->Construct_ObjectsAndScripts(); $this->Construct_ScriptName(); - if($this->script_name) - { + + if($this->script_name) { $this->Construct_ScriptFileAndExtension(); $this->Construct_ScriptClassname(); $this->Construct_ScriptFormat(); $this->Construct_ScriptLocation(); $this->Construct_SocialMedia(); } + + return TRUE; } public function __destruct() { @@ -54,8 +55,8 @@ public function __destruct() { } public function Construct_SetErrorLogging() { - $this->error_logging = new ErrorLogging([handler=>$this]); - $this->issue_logging = new IssueLogging([handler=>$this]); + $this->error_logging = new ErrorLogging(['handler'=>$this]); + $this->issue_logging = new IssueLogging(['handler'=>$this]); return TRUE; } @@ -89,8 +90,7 @@ public function CheckSecurity() { $this->access = $authentication->access_granted; $this->redirect = $authentication->redirect; - if($this->script->script->isSecure()) - { + if($this->script->script->isSecure()) { $this->authentication->ReAuthenticate(); } } @@ -154,7 +154,10 @@ public function Construct_Language() { } public function Construct_Dictionaries() { - $dictionary = new Dictionary(['dbaccess'=>$this->db_access]); + $dictionary = new Dictionary([ + 'dbaccess'=>$this->db_access, + 'globals'=>$this->globals, + ]); return $this->dictionary = $dictionary; } @@ -212,9 +215,9 @@ public function Construct_ScriptName() { $permalink_id = (int)$this->query->Parameter(['parameter'=>'id']); if($permalink_id) { $assignment_record_args = [ - 'type'=>Assignment, + 'type'=>'Assignment', 'definition'=>[ - id=>$permalink_id, + 'id'=>$permalink_id, ], ]; @@ -222,14 +225,14 @@ public function Construct_ScriptName() { if($assignment && $assignment[0] && $assignment[0]['id']) { require('../classes/Database/ORM.php'); - $this->orm = new ORM([dbaccessobject=>$this->db_access]); + $this->orm = new ORM(['dbaccessobject'=>$this->db_access]); $assignment = $assignment[0]; $entry_records = $this->orm->SearchForEntries([ - fieldname=>'id', - fieldvalue=>$assignment['Childid'], - assignmentid=>$permalink_id, + 'fieldname'=>'id', + 'fieldvalue'=>$assignment['Childid'], + 'assignmentid'=>$permalink_id, ])[0]; $redirect_url = ''; @@ -248,7 +251,13 @@ public function Construct_ScriptName() { $redirect_url .= '/' . $entry_record['Code']; } - $redirect_url .= '/view.php'; + $action = $this->query->Parameter(['parameter'=>'action']); + + if($action == 'Edit') { + $redirect_url .= '/modify.php'; + } else { + $redirect_url .= '/view.php'; + } if($this->desired_action) { $redirect_url .= '?action=' . $this->desired_action; @@ -303,12 +312,13 @@ public function Construct_SocialMedia() { 'dbaccessobject'=>$this->db_access, 'authenticationobject'=>$this->authentication, 'globals'=>$this->globals, + 'cookie'=>$this->cookie, ]); - $google_token_id = $this->query->Parameter([parameter=>'google_token_id']); + $google_token_id = $this->query->Parameter(['parameter'=>'google_token_id']); $google_log_results = $this->google_api->AuthenticateOrDisauthenticateWithGoogle([ 'token'=>$google_token_id, - 'logout'=>$this->query->Parameter([parameter=>'logout']), + 'logout'=>$this->query->Parameter(['parameter'=>'logout']), ]); if($google_log_results['action'] == 'logout') { @@ -435,6 +445,10 @@ public function Construct_ScriptFormatLower_DetermineScriptFormatLower() { } public function HandleRequest() { + if($this->SecureRequired()) { + return $this->SecureRedirect(); + } + if(!$this->ValidateReferrals()) { return FALSE; } @@ -454,9 +468,26 @@ public function HandleRequest() { return TRUE; } + public function SecureRequired() { + if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] === "off") { + if($_COOKIE['loggedin']) { + return TRUE; + } + } + + return FALSE; + } + + public function SecureRedirect() { + $location = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + header('Location: ' . $location); + + return TRUE; + } + public function ValidateReferrals() { if(!$this->domain->ValidateReferringWebsite()) { - print("Error 403 - You done been smote."); + print('Error 403 - You done been smote.'); return FALSE; } @@ -481,40 +512,33 @@ public function HandleRequest_Content() { $shared_location = '../clonefrom.com' . $_SERVER['SCRIPT_URL']; - if(!is_file($client_location) && is_file($shared_location)) - { + if(!is_file($client_location) && is_file($shared_location)) { require('../classes/Networking/MIMEType.php'); $mimetype = new MIMEType; $mimetypes = $mimetype->GetMIMETypeCodes(); $desired_content_header = $mimetypes[$this->script_extension]; - if($desired_content_header) - { + if($desired_content_header) { $header_text = 'Content-type: ' . $desired_content_header . '; charset=utf-8'; header($header_text); } - if($desired_content_header == 'text/html') - { + if($desired_content_header == 'text/html') { return require($shared_location); - } - else - { + } else { return readfile($shared_location); } } - if(!is_file($this->script_location) || !$this->script_format) - { + if(!is_file($this->script_location) || !$this->script_format) { return FALSE; } $this->HandleRequest_Content_Format_GetFormatObject(); $this->script = $this->HandleRequest_Content_Format_InstantiateFormatObject(); - if($this->script->CanAccess()) - { + if($this->script->CanAccess()) { return $this->HandleRequest_Content_Format(); } @@ -524,22 +548,17 @@ public function HandleRequest_Content() { public function HandleRequest_Content_Format() { $this->CheckSecurity(); - if($this->access) - { - if(method_exists($this->script->script, $this->desired_action)) - { + if($this->access) { + if(method_exists($this->script->script, $this->desired_action)) { $desired_action = $this->desired_action; return $this->script->Display(); } - } - else - { - if($this->authentication->redirect) - { + } else { + if($this->authentication->redirect) { # handle security-triggered redirect $other_script_args = $this->HandleRequest_Content_Format_InstantiateFormatObject_PartialArgs(); - $other_script_args[redirect] = $this->script->redirect_object; + $other_script_args['redirect'] = $this->script->redirect_object; return ($this->authentication->RedirectToNewURL($other_script_args)); } } diff --git a/classes/Security/Authentication.php b/classes/Security/Authentication.php index 1341dfa..2c27559 100644 --- a/classes/Security/Authentication.php +++ b/classes/Security/Authentication.php @@ -1,7 +1,6 @@ db_access = $args[dbaccess]; $this->domain = $args[domain]; $this->cookie = $args[cookie]; @@ -26,11 +24,9 @@ public function __construct($args) $this->protocol = ''; } - public function Authenticate($args) - { + public function Authenticate($args) { $this->script = $args[script]; - if($this->script->script) - { + if($this->script->script) { $this->DetectHTTPS(); if($this->protocol == 'ssl') { @@ -104,8 +100,7 @@ public function Authenticate($args) } } - public function ReAuthenticate() - { + public function ReAuthenticate() { if(!$this->user_session) { $this->CheckCurrentAuthentication(); @@ -125,13 +120,11 @@ public function ReAuthenticate() return TRUE; } - public function RefreshAuthentication() - { + public function RefreshAuthentication() { return $this->Login_Successful([useraccount=>$this->user_account, refresh=>1]); } - public function CheckAuthenticationForCurrentObject() - { + public function CheckAuthenticationForCurrentObject() { if($this->CheckAuthenticationForCurrentObject_IsAdmin() || $this->CheckAuthenticationForCurrentObject_IsOwner()) { return TRUE; @@ -140,8 +133,7 @@ public function CheckAuthenticationForCurrentObject() return FALSE; } - public function CheckAuthenticationForCurrentObject_IsAdmin() - { + public function CheckAuthenticationForCurrentObject_IsAdmin() { if($this->user_session && $this->user_session['UserAdmin.id']) { return TRUE; @@ -150,28 +142,24 @@ public function CheckAuthenticationForCurrentObject_IsAdmin() return FALSE; } - public function CheckAuthenticationForCurrentObject_IsOwner() - { + public function CheckAuthenticationForCurrentObject_IsOwner() { return FALSE; } - public function CheckCurrentAuthentication() - { + public function CheckCurrentAuthentication() { $authentication_token = $this->cookie_token; - if(!$authentication_token) - { - $authentication_token = $this->cookie->GetCookie([cookie=>'AuthenticationToken']); + if(!$authentication_token) { + $authentication_token = $this->cookie->GetCookie(['cookie'=>'AuthenticationToken']); } - if($authentication_token) - { + if($authentication_token) { $user_session_record_args = [ - 'type'=>UserSession, + 'type'=>'UserSession', 'definition'=>[ - CookieToken=>$authentication_token, + 'CookieToken'=>$authentication_token, 'RAW'=>[ - LastAccess=>[ + 'LastAccess'=>[ '<', 'DATE_ADD(UserSession.LastAccess, INTERVAL 160 HOUR)', ], @@ -187,8 +175,7 @@ public function CheckCurrentAuthentication() ]; $user_session = $this->db_access->GetRecords($user_session_record_args); - if($user_session) - { + if($user_session) { $this->user_session = $user_session[0]; return TRUE; } @@ -197,8 +184,7 @@ public function CheckCurrentAuthentication() return 0; } - public function Login($args) - { + public function Login($args) { $username = $args[username]; $password = $args[password]; @@ -225,75 +211,70 @@ public function Login($args) $user_account = $this->db_access->GetRecords($user_record_args); - if($user_account) - { + if($user_account) { $this->user_account = $user_account; $login_successful_args = [ - useraccount=>$user_account, + 'useraccount'=>$user_account, ]; return $this->Login_Successful($login_successful_args); - } - else - { + } else { $login_failure_args = [ - username=>$username, - password=>$password, - hashedpassword=>$hashed_password, + 'username'=>$username, + 'password'=>$password, + 'hashedpassword'=>$hashed_password, ]; return $this->Login_Failure($login_failure_args); } } - public function Logout() - { + public function Logout() { + $user_session = $this->user_session; + $this->Logout_ResetCookie(); $this->Logout_ResetDatabase(); unset($this->user_session); unset($this->user_account); - return TRUE; + + return $user_session; } - public function Logout_ResetDatabase() - { - $authentication_token = $this->cookie->GetCookie([cookie=>'AuthenticationToken']); + public function Logout_ResetDatabase() { + $authentication_token = $this->cookie->GetCookie(['cookie'=>'AuthenticationToken']); $user_session_update_args = [ - type=>'UserSession', - update=>[ - CookieToken=>'', - LastAccess=>'00:00:00 0000-00-00', + 'type'=>'UserSession', + 'update'=>[ + 'CookieToken'=>'', + 'LastAccess'=>'00:00:00 0000-00-00', ], - where=>[ - CookieToken=>$authentication_token, + 'where'=>[ + 'CookieToken'=>$authentication_token, ], ]; return $this->db_access->UpdateRecord($user_session_update_args); } - public function Logout_ResetCookie() - { + public function Logout_ResetCookie() { $set_authentication_cookie_args = [ - secure=>TRUE, - key=>'AuthenticationToken', - value=>null, + 'secure'=>TRUE, + 'key'=>'AuthenticationToken', + 'value'=>null, ]; $this->cookie->SetCookie($set_authentication_cookie_args); } - public function GenerateCookieToken($args) - { + public function GenerateCookieToken($args) { return $this->GenerateCookieToken_Secure($args); } - public function GenerateCookieToken_Secure($args) - { - $user_account = $args[useraccount]; + public function GenerateCookieToken_Secure($args) { + $user_account = $args['useraccount']; $hash_values = []; - $hash_values[] = $user_account[Username]; + $hash_values[] = $user_account['Username']; $hash_values[] = $this->AuthenticationToken_Salt1(); $hash_values[] = $this->time->time; $hash_values[] = $this->AuthenticationToken_Salt2(); @@ -305,9 +286,9 @@ public function GenerateCookieToken_Secure($args) $this->base_object = $base_object; $convert_base_args = [ - value=>$hash_token, - startingbase=>'Hexadecimal', - endingbase=>'Base64', + 'value'=>$hash_token, + 'startingbase'=>'Hexadecimal', + 'endingbase'=>'Base64', ]; $hash_token_base64 = $base_object->ConvertBase($convert_base_args); @@ -315,18 +296,15 @@ public function GenerateCookieToken_Secure($args) return $hash_token_base64; } - public function AuthenticationToken_Salt1() - { + public function AuthenticationToken_Salt1() { return 'Ehtdetohda80d2)*08'; } - public function AuthenticationToken_Salt2() - { + public function AuthenticationToken_Salt2() { return ';d79d(:Ddaddhr]LS-'; } - public function GenerateCookieToken_Random() - { + public function GenerateCookieToken_Random() { $random_class_location = '../classes/Math/Random.php'; require($random_class_location); $this->random = new Random(); @@ -340,47 +318,42 @@ public function GenerateCookieToken_Random() return $cookie_token; } - public function Login_Successful($args) - { - $user_account = $args[useraccount]; + public function Login_Successful($args) { + $user_account = $args['useraccount']; $user_session = $this->user_session; $first_user_account = $user_account[0]; $userid = $first_user_account[id]; - if(!$userid) - { + if(!$userid) { $userid = $user_session['Userid']; } $cookie_token_args = [ - useraccount=>$first_user_account, + 'useraccount'=>$first_user_account, ]; $cookie_token = $this->GenerateCookieToken($cookie_token_args); - if(!$this->AllowMultipleDeviceLogin() || $args['refresh']) - { + if(!$this->AllowMultipleDeviceLogin() || $args['refresh']) { $user_session_where_args = [ - type=>UserSession, - definition=>[ - Userid=>$userid, + 'type'=>'UserSession', + 'definition'=>[ + 'Userid'=>$userid, ], - limit=>1, + 'limit'=>1, ]; - if($args['refresh']) - { + if($args['refresh']) { $user_session_where_args['definition']['CookieToken'] = $user_session['CookieToken']; } $user_session = $this->db_access->GetRecords($user_session_where_args); - if($user_session) - { + if($user_session) { $first_user_session = $user_session[0]; $new_user_session = $first_user_session; - $new_user_session[CookieToken] = $cookie_token; - $new_user_session[LastAccess] = 'NOW()'; + $new_user_session['CookieToken'] = $cookie_token; + $new_user_session['LastAccess'] = 'NOW()'; $user_session_update_args = [ type=>UserSession, @@ -405,8 +378,7 @@ public function Login_Successful($args) } } - if(!$user_session_returnable) - { + if(!$user_session_returnable) { $user_session_insert_args = [ type=>UserSession, definition=>[ @@ -442,8 +414,7 @@ public function Login_Successful($args) ]; } - public function Login_Failure($args) - { + public function Login_Failure($args) { $username = $args[username]; $password = $args[password]; $hashed_password = $args[hashed_password]; @@ -454,18 +425,15 @@ public function Login_Failure($args) ]; } - public function AllowMultipleDeviceLogin() - { + public function AllowMultipleDeviceLogin() { return TRUE; } - public function RedirectToNewURL($args) - { - $redirect_object = $args[redirect]; - unset($args[redirect]); + public function RedirectToNewURL($args) { + $redirect_object = $args['redirect']; + unset($args['redirect']); - switch($this->redirect_type) - { + switch($this->redirect_type) { case 'ssl': return $redirect_object->RedirectToSecuredConnection($args); break; @@ -482,14 +450,10 @@ public function RedirectToNewURL($args) return FALSE; } - public function DetectHTTPS() - { - if($_SERVER[HTTPS] == 'on') - { + public function DetectHTTPS() { + if($_SERVER['HTTPS'] == 'on') { $this->protocol = 'ssl'; - } - else - { + } else { $this->protocol = 'unencrypted'; } } diff --git a/clonefrom.com/crossword-puzzle-demo.html b/clonefrom.com/crossword-puzzle-demo.html index 429c2e3..88cb091 100644 --- a/clonefrom.com/crossword-puzzle-demo.html +++ b/clonefrom.com/crossword-puzzle-demo.html @@ -5,7 +5,6 @@ - @@ -15,1280 +14,24 @@ '); +// print(""); + + // Display Social Media Options + + // ------------------------------------------------------------- + + $social_media_share_links->display(); + + // Display Language Options + + // ------------------------------------------------------------- + + $languages->display(); + + // Display Final Ending Navigation + + // ------------------------------------------------------------- + + $bottom_navigation_args = [ + 'thispage'=>'Home', + ]; + $navigation->DisplayBottomNavigation($bottom_navigation_args); + +?> \ No newline at end of file diff --git a/templates/default/spellchecker/display_css.php b/templates/default/spellchecker/display_css.php new file mode 100644 index 0000000..1c2c2c1 --- /dev/null +++ b/templates/default/spellchecker/display_css.php @@ -0,0 +1,64 @@ +width/width-1percent.css +width/width-33percent.css +width/width-100percent.css +width/width-70percent.css +width/width-95percent.css +width/width-90percent.css +width/width-50percent.css +location/float-left.css +location/float-right.css +location/horizontal-center.css +location/horizontal-left.css +location/display-inline-block.css +cursor/cursor-pointer.css +location/clear-float.css +divider/overflow-auto.css +height/height-400px.css +height/height-75px.css +height/height-115px.css +height/height-50percent.css +list/hideable.css +background-color/background-color-gray13.css +background-color/background-color-gray10.css +background-color/background-color-6495ED.css +background-color/background-color-C2DFFF.css +list/arrow.css +image/flip-image.css +border/border-1px.css +border/border-2px.css +border/border-bottom-1px.css +spacing/margin-5px.css +spacing/margin-10px.css +spacing/padding-0px.css +spacing/padding-5px.css +spacing/padding-10px.css +spacing/padding-left-10px.css +spacing/padding-right-10px.css +spacing/padding-left-15px.css +spacing/padding-right-15px.css +spacing/margin-0px.css +spacing/margin-top-5px.css +spacing/margin-top-10px.css +spacing/margin-top-14px.css +spacing/margin-top-22px.css +spacing/padding-top-14px.css +spacing/padding-top-22px.css +spacing/margin-bottom-5px.css +spacing/margin-left-5px.css +spacing/margin-right-5px.css +spacing/margin-left-10px.css +spacing/margin-right-10px.css +location/vertical-center.css +spacing/margin-5px.css +spacing/margin-50px.css +spacing/margin-bottom-10px.css +spacing/padding-2px.css +spacing/margin-2px.css +width/width-50px.css +font/header-1.css +font/header-2.css +font/noselect.css +font/font-family-tahoma.css +font/font-family-arial.css +font/font-size-150percent.css +jquery.numberedtextarea.css \ No newline at end of file diff --git a/templates/default/spellchecker/display_javascript.php b/templates/default/spellchecker/display_javascript.php new file mode 100644 index 0000000..0ebf4f7 --- /dev/null +++ b/templates/default/spellchecker/display_javascript.php @@ -0,0 +1,4 @@ +jQueryRotate.js +list/hideable-arrow.js +link-clickable.js +spellchecker.js \ No newline at end of file diff --git a/templates/default/suggest/display.php b/templates/default/suggest/display.php index 1a0dda0..0ff833b 100644 --- a/templates/default/suggest/display.php +++ b/templates/default/suggest/display.php @@ -75,6 +75,53 @@ ]; $header->display($header_primary_args); + + // Start Top Bar + + // ------------------------------------------------------------- + + print('
'); + + // Breadcrumbs Info + + // ------------------------------------------------------------- + + $breadcrumbs_title = 'Make a Suggestion'; + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$breadcrumbs_title]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); + + // Finish Breadcrumb Trails + + // ------------------------------------------------------------- + + $clear_float_divider_start_args = [ + 'class'=>'clear-float', + 'indentlevel'=>5, + ]; + + $divider->displaystart($clear_float_divider_start_args); + + $clear_float_divider_end_args = [ + 'indentlevel'=>5, + ]; + + $divider->displayend($clear_float_divider_end_args); // Basic Divider Arguments @@ -154,17 +201,14 @@ print('Suggestions For : ' . $this->parent['Title'] . ' > ' . $this->entry['Title']); - if($this->authentication_object->user_session['User.Username']) - { + if($this->authentication_object->user_session['User.Username']) { $username = $this->authentication_object->user_session['User.Username']; - } - else - { + } else { $username = $this->authentication_object->user_session['User.EmailAddress']; } print(''); - print('

Logged in as : ' . $username . ' (Logout)

'); + print('

'); // Display Form @@ -191,16 +235,16 @@ print('

'); - // Search Button + // Suggestion Button // ------------------------------------------------------------- $type_args = [ - type=>'submit', - name=>'submit', - value=>'Submit Suggestion', + 'type'=>'submit', + 'name'=>'submit', + 'value'=>'Submit Suggestion', 'class'=>'float-right', - indentlevel=>5, + 'indentlevel'=>5, ]; $form->DisplayFormField($type_args); @@ -234,7 +278,7 @@ // ------------------------------------------------------------- $end_form_args = [ - indentlevel=>1, + 'indentlevel'=>1, ]; $form->EndForm($end_form_args); } else { @@ -260,8 +304,7 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { + if($this->authentication_object->user_session['UserAdmin.id']) { print(''); print('ADMIN, Suggestion Definition ::'); @@ -349,11 +392,11 @@ print('
'); print(''); $type_args = [ - type=>'submit', - id=>'submit', - name=>'Comment', - value=>'Comment', - indentlevel=>5, + 'type'=>'submit', + 'id'=>'submit', + 'name'=>'Comment', + 'value'=>'Comment', + 'indentlevel'=>5, ]; print('' . "\n\n"); @@ -395,38 +438,18 @@ print('
'); $new_url = str_replace('/view.php', '/view.php#comments', $_SERVER['SCRIPT_URL']); - print('

Login to Comment

'); + print('

Login to Comment

'); print('
'); print(''); } - // DEBUG - - // ------------------------------------------------------------- - -# print("BT: INDEX view.php script, display.php template, CHILDOF-people

"); - - /* - print("
RECORD LIST:");
-	print_r($this->record_list);
-	print("\n\nMASTER RECORD:\n\n");
-	print_r($this->master_record);
-	print("\n\nPARENT:\n\n");
-	print_r($this->parent);
-	print("\n\nENTRY:\n\n");
-	print_r($this->entry);
-	print("\n\nCHILDREN:\n\n");
-	print_r($this->children);
-	print("
"); - */ - // Display Final Ending Navigation // ------------------------------------------------------------- $bottom_navigation_args = [ - 'thispage'=>'Search', + 'thispage'=>'Suggestions', ]; $navigation->DisplayBottomNavigation($bottom_navigation_args); diff --git a/templates/default/terms/display.php b/templates/default/terms/display.php index 8473421..879cc91 100644 --- a/templates/default/terms/display.php +++ b/templates/default/terms/display.php @@ -336,29 +336,34 @@ ]], ]; $generic_list->Display($version_list_display_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($terms_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>'Terms of Service']); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails @@ -376,162 +381,14 @@ ]; $divider->displayend($clear_float_divider_end_args); - - - // All Formats - - // ------------------------------------------------------------- - - - print('
'); - $full_user_name = urlencode($this->user['Username']); + // Alternate Formats Info - $formats = [ - [ - text=>'Mobile
Version', - image=>'mobile-icon.jpg', - url=>'terms.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - image=>'pdf-file-icon.jpg', - url=>'terms.pdf', - ], - [ - text=>'Printer
Friendly', - image=>'printer-friendly-icon.jpg', - url=>'terms.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - image=>'plaintext-format-icon.jpg', - url=>'terms.txt', - ], - [ - text=>'Wrapped
Plaintext', - image=>'wrapped-plaintext-format-icon.jpg', - url=>'terms.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - image=>'colors-inverted-icon.jpg', - url=>'terms.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - image=>'rtf-file-icon.jpg', - url=>'terms.rtf', - ], - [ - text=>'Epub
File', - image=>'epub-file-icon.jpg', - url=>'terms.epub', - ], - [ - text=>'DAISY
Format', - image=>'daisy-format-icon.jpg', - url=>'terms.daisy', - ], - [ - text=>'SGML
Format', - image=>'sgml-format-icon.jpg', - url=>'terms.sgml', - ], - [ - text=>'JSON
Format', - image=>'json-format-icon.jpg', - url=>'terms.json', - ], - [ - text=>'XML
Format', - image=>'xml-format-icon.jpg', - url=>'terms.xml', - ], - [ - text=>'CSV
Format', - image=>'csv-format-icon.jpg', - url=>'terms.csv', - ], - [ - text=>'Latex
Format', - image=>'latex-format-icon.jpg', - url=>'terms.tex', - ], - [ - text=>'OPDS
Format', - image=>'opds-format-icon.jpg', - url=>'terms.opds', - ], - [ - text=>'RDF
Format', - image=>'rdf-format-icon.jpg', - url=>'terms.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'terms.php', - ]; - } - - $formats_count = count($formats); - - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - print('
'); - - if(!$this->mobile_friendly) - { - print('
'); - print(''); - print(''); - print(''); - print('
'); - } - - print('

'); - print(''); - print($format['text']); - print(''); - print('

'); - print('
'); - print('
'); - } - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + // ------------------------------------------------------------- - print("
"); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); // Get Info Header Language @@ -604,10 +461,10 @@ $privacy_policy_text = $this->getTermsOfService(); $privacy_policy_text = str_replace('

', '

', $privacy_policy_text); - $element_text_args = [ - text=>$privacy_policy_text, - indentlevel=>5, - ]; + print('

'); + print($privacy_policy_text); + print('
'); + $text->Display($element_text_args); $divider->displayend($divider_end_args); diff --git a/templates/default/terms/display_css.php b/templates/default/terms/display_css.php index 6e3cf22..c1bb31f 100644 --- a/templates/default/terms/display_css.php +++ b/templates/default/terms/display_css.php @@ -1,20 +1,25 @@ width/width-1percent.css width/width-33percent.css width/width-100percent.css -width/width-80percent.css -width/width-70percent.css width/width-95percent.css width/width-90percent.css +width/width-85percent.css +width/width-80percent.css +width/width-70percent.css width/width-50percent.css location/float-left.css location/float-right.css location/horizontal-center.css location/horizontal-left.css +location/display-inline-block.css cursor/cursor-pointer.css location/clear-float.css divider/overflow-auto.css height/height-400px.css +height/height-200px.css +height/height-100px.css height/height-75px.css +height/height-115px.css list/hideable.css color/color-gray15.css background-color/background-color-gray15.css @@ -24,7 +29,6 @@ background-color/background-color-gray0.css background-color/background-color-6495ED.css background-color/background-color-C2DFFF.css -background-color/background-color-B7CEEC.css list/arrow.css image/flip-image.css border/border-1px.css @@ -40,25 +44,36 @@ spacing/padding-left-15px.css spacing/padding-right-15px.css spacing/margin-0px.css +spacing/margin-top-0px.css spacing/margin-top-5px.css +spacing/margin-top-10px.css spacing/margin-top-14px.css spacing/margin-top-22px.css spacing/padding-top-14px.css spacing/padding-top-22px.css +spacing/padding-bottom-22px.css spacing/margin-bottom-5px.css -spacing/margin-bottom-0px.css +spacing/margin-bottom-22px.css spacing/margin-left-5px.css +spacing/margin-left-10px.css +spacing/margin-left-20px.css spacing/margin-right-5px.css +spacing/margin-right-10px.css +spacing/margin-right-20px.css location/vertical-center.css +location/vertical-specialcenter.css spacing/margin-5px.css spacing/margin-50px.css spacing/margin-bottom-10px.css spacing/padding-2px.css spacing/margin-2px.css +width/width-200px.css +width/width-100px.css width/width-50px.css font/header-1.css font/header-2.css font/noselect.css font/font-family-tahoma.css font/font-family-arial.css -text/text-indent-25px.css \ No newline at end of file +font/font-size-150percent.css +font/font-size-75percent.css \ No newline at end of file diff --git a/templates/default/terms/display_javascript.php b/templates/default/terms/display_javascript.php index a1e050b..06e2305 100644 --- a/templates/default/terms/display_javascript.php +++ b/templates/default/terms/display_javascript.php @@ -1,3 +1,46 @@ +jQueryRotate.js list/hideable-arrow.js link-clickable.js -list-sortable.js \ No newline at end of file +responsivevoice.js +text-audio.js +select-input.js +google-comments.js +like-dislike.js +background-slideshow.js +listen-to-audio-phrase.js +https://www.google.com/jsapi +google-cse.js +language-lesson-and-quiz.js +detect-browser.js +voice-to-text.js +game-play.jsjQueryRotate.js +list/hideable-arrow.js +link-clickable.js +responsivevoice.js +text-audio.js +select-input.js +google-comments.js +like-dislike.js +background-slideshow.js +listen-to-audio-phrase.js +https://www.google.com/jsapi +google-cse.js +language-lesson-and-quiz.js +detect-browser.js +voice-to-text.js +game-play.jsjQueryRotate.js +list/hideable-arrow.js +link-clickable.js +responsivevoice.js +text-audio.js +select-input.js +google-comments.js +like-dislike.js +background-slideshow.js +listen-to-audio-phrase.js +https://www.google.com/jsapi +google-cse.js +language-lesson-and-quiz.js +detect-browser.js +voice-to-text.js +game-play.js \ No newline at end of file diff --git a/templates/default/users/browseComments.php b/templates/default/users/browseComments.php index 927d2bb..5341a55 100644 --- a/templates/default/users/browseComments.php +++ b/templates/default/users/browseComments.php @@ -113,67 +113,47 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); + // Start Top Bar + + // ------------------------------------------------------------- - print(''); + print('

'); - print($this->master_record['Title']); + // Breadcrumbs Info + + // ------------------------------------------------------------- - print(''); + + $breadcrumbs_title = ''; + $breadcrumbs_title .= $this->user['Username']; + $breadcrumbs_title .= ''; + $breadcrumbs_title .= ' >> '; + $breadcrumbs_title .= 'Browsing Comments'; - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$breadcrumbs_title]); + $breadcrumbs->Display(); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // Login Info - print($record['Title']); + // ------------------------------------------------------------- - print(''); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - print(' >> '); - print(''); - print($this->user['Username']); - print(''); + // End Top Bar + + // ------------------------------------------------------------- - print(' >> Browsing Comments'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/users/browseLikes.php b/templates/default/users/browseLikes.php index e1cfaa1..a01780c 100644 --- a/templates/default/users/browseLikes.php +++ b/templates/default/users/browseLikes.php @@ -113,67 +113,46 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); + // Start Top Bar + + // ------------------------------------------------------------- - print(''); + print('

'); - print($this->master_record['Title']); + // Breadcrumbs Info + + // ------------------------------------------------------------- - print(''); + $breadcrumbs_title = ''; + $breadcrumbs_title .= $this->user['Username']; + $breadcrumbs_title .= ''; + $breadcrumbs_title .= ' >> '; + $breadcrumbs_title .= 'Browsing Likes'; - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$breadcrumbs_title]); + $breadcrumbs->Display(); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // Login Info - print($record['Title']); + // ------------------------------------------------------------- - print(''); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - print(' >> '); - print(''); - print($this->user['Username']); - print(''); + // End Top Bar + + // ------------------------------------------------------------- - print(' >> Browsing Likes'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/users/exportuser.php b/templates/default/users/exportuser.php index cf16c6a..9365242 100644 --- a/templates/default/users/exportuser.php +++ b/templates/default/users/exportuser.php @@ -334,67 +334,47 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); + // Start Top Bar + + // ------------------------------------------------------------- - print(''); + print('

'); - print($this->master_record['Title']); + // Breadcrumbs Info + + // ------------------------------------------------------------- - print(''); + + $breadcrumbs_title = ''; + $breadcrumbs_title .= $this->user['Username']; + $breadcrumbs_title .= ''; + $breadcrumbs_title .= ' >> '; + $breadcrumbs_title .= 'Export User Data'; - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$breadcrumbs_title]); + $breadcrumbs->Display(); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // Login Info - print($record['Title']); + // ------------------------------------------------------------- - print(''); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - print(' >> '); - print(''); - print($this->user['Username']); - print(''); + // End Top Bar + + // ------------------------------------------------------------- - print(' >> Export User'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails @@ -412,157 +392,14 @@ ]; $divider->displayend($clear_float_divider_end_args); - - - // All Formats - - // ------------------------------------------------------------- - - $full_user_name = urlencode($this->user['Username']); - - $formats = [ - [ - text=>'Mobile
Version', - image=>'mobile-icon.jpg', - url=>'users.php?action=exportuser&mobilefriendly=1&user=' . $full_user_name, - ], - [ - text=>'PDF
File', - image=>'pdf-file-icon.jpg', - url=>'users.pdf?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'Printer
Friendly', - image=>'printer-friendly-icon.jpg', - url=>'users.php?action=exportuser&printerfriendly=1&user=' . $full_user_name, - ], - [ - text=>'Plaintext
File', - image=>'plaintext-format-icon.jpg', - url=>'users.txt?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'Wrapped
Plaintext', - image=>'wrapped-plaintext-format-icon.jpg', - url=>'users.txt?action=exportuser&wrapped=1&user=' . $full_user_name, - ], - [ - text=>'Inverted
Colors', - image=>'colors-inverted-icon.jpg', - url=>'users.php?action=exportuser&invertedcolors=1&user=' . $full_user_name, - ], - [ - text=>'RTF
File', - image=>'rtf-file-icon.jpg', - url=>'users.rtf?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'Epub
File', - image=>'epub-file-icon.jpg', - url=>'users.epub?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'DAISY
Format', - image=>'daisy-format-icon.jpg', - url=>'users.daisy?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'SGML
Format', - image=>'sgml-format-icon.jpg', - url=>'users.sgml?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'JSON
Format', - image=>'json-format-icon.jpg', - url=>'users.json?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'XML
Format', - image=>'xml-format-icon.jpg', - url=>'users.xml?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'CSV
Format', - image=>'csv-format-icon.jpg', - url=>'users.csv?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'Latex
Format', - image=>'latex-format-icon.jpg', - url=>'users.tex?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'OPDS
Format', - image=>'opds-format-icon.jpg', - url=>'users.opds?action=exportuser&user=' . $full_user_name, - ], - [ - text=>'RDF
Format', - image=>'rdf-format-icon.jpg', - url=>'users.rdf?action=exportuser&user=' . $full_user_name, - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'users.php?action=exportuser&user=' . $full_user_name, - ]; - } - - $formats_count = count($formats); - - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - print('
'); - - if(!$this->mobile_friendly) - { - print('
'); - print(''); - print(''); - print(''); - print('
'); - } - - print('

'); - print(''); - print($format['text']); - print(''); - print('

'); - print('
'); - print('
'); - } - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - $divider->displaystart($clear_float_divider_start_args); + // Alternate Formats Info - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); // View Browsing Numbers diff --git a/templates/default/users/exportuser_css.php b/templates/default/users/exportuser_css.php index 609fa43..d16e6c5 100644 --- a/templates/default/users/exportuser_css.php +++ b/templates/default/users/exportuser_css.php @@ -1,6 +1,7 @@ width/width-1percent.css width/width-33percent.css width/width-100percent.css +width/width-85percent.css width/width-80percent.css width/width-70percent.css width/width-95percent.css @@ -10,14 +11,13 @@ location/float-right.css location/horizontal-center.css location/horizontal-left.css -location/display-inline-block.css cursor/cursor-pointer.css location/clear-float.css divider/overflow-auto.css height/height-400px.css -height/height-100px.css height/height-75px.css list/hideable.css +color/color-gray15.css background-color/background-color-gray15.css background-color/background-color-gray14.css background-color/background-color-gray13.css @@ -25,6 +25,7 @@ background-color/background-color-gray0.css background-color/background-color-6495ED.css background-color/background-color-C2DFFF.css +background-color/background-color-B7CEEC.css list/arrow.css image/flip-image.css border/border-1px.css @@ -41,28 +42,24 @@ spacing/padding-right-15px.css spacing/margin-0px.css spacing/margin-top-5px.css -spacing/margin-top-10px.css spacing/margin-top-14px.css spacing/margin-top-22px.css spacing/padding-top-14px.css spacing/padding-top-22px.css spacing/margin-bottom-5px.css +spacing/margin-bottom-0px.css spacing/margin-left-5px.css spacing/margin-right-5px.css -spacing/margin-left-10px.css -spacing/margin-right-10px.css location/vertical-center.css -location/vertical-specialcenter.css spacing/margin-5px.css spacing/margin-50px.css spacing/margin-bottom-10px.css spacing/padding-2px.css spacing/margin-2px.css -width/width-100px.css width/width-50px.css font/header-1.css font/header-2.css font/noselect.css font/font-family-tahoma.css font/font-family-arial.css -font/font-size-150percent.css \ No newline at end of file +text/text-indent-25px.css \ No newline at end of file diff --git a/templates/default/view/browse.php b/templates/default/view/browse.php index 4d550e1..356cd97 100644 --- a/templates/default/view/browse.php +++ b/templates/default/view/browse.php @@ -112,57 +112,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/view/browseByTag.php b/templates/default/view/browseByTag.php index 66eaa57..fc93715 100644 --- a/templates/default/view/browseByTag.php +++ b/templates/default/view/browseByTag.php @@ -112,56 +112,35 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - // Breadcrumb Trails - - // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print('tag_cleansed . '"']); + $breadcrumbs->Display(); + + // Login Info - print('">'); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing by Tag "' . $this->tag_cleansed . '"'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/view/definitions.php b/templates/default/view/definitions.php index 77f5561..d2f121c 100644 --- a/templates/default/view/definitions.php +++ b/templates/default/view/definitions.php @@ -125,58 +125,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - - print(' >> '); + // Breadcrumbs Info - $link_list .= '/' . $record['Code']; - - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Definitions'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/view/dictionary.php b/templates/default/view/dictionary.php index 98bc1ac..b363dfe 100644 --- a/templates/default/view/dictionary.php +++ b/templates/default/view/dictionary.php @@ -125,58 +125,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - - print(' >> '); + // Breadcrumbs Info - $link_list .= '/' . $record['Code']; - - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Definitions'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/default/view/display.php b/templates/default/view/display.php index 437d0e2..edfab03 100644 --- a/templates/default/view/display.php +++ b/templates/default/view/display.php @@ -76,7 +76,7 @@ if($this->authentication_object->user_session['UserAdmin.id']) { require('../modules/html/entry-controls.php'); $entry_controls = new module_entrycontrols; - $entry_controls->Display(); + $entry_controls->Display(['that'=>$this]); } // View Selected Record List diff --git a/templates/default/view/index.php b/templates/default/view/index.php index ab48136..9bcc73e 100644 --- a/templates/default/view/index.php +++ b/templates/default/view/index.php @@ -114,128 +114,48 @@ $divider_end_args = [ 'indentlevel'=>1, ]; + + // Admin Controls - // Admin Controls + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } + + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; + print('
'); + + // Breadcrumbs Info - $divider->displaystart($clear_float_divider_start_args); + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print('
'); - } - - // Breadcrumb Trails + // ------------------------------------------------------------- - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); + print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // Finish Breadcrumb Trails - $link_list = ''; - - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - else - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); - print('
'); + // ------------------------------------------------------------- $clear_float_divider_start_args = [ 'class'=>'clear-float', diff --git a/templates/default/view/viewUserLikes.php b/templates/default/view/viewUserLikes.php index fb77d78..9eeb0c3 100644 --- a/templates/default/view/viewUserLikes.php +++ b/templates/default/view/viewUserLikes.php @@ -161,57 +161,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Who Liked This?'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/earthfluent/about/display.php b/templates/earthfluent/about/display.php index 09718ff..ba911ab 100644 --- a/templates/earthfluent/about/display.php +++ b/templates/earthfluent/about/display.php @@ -1939,29 +1939,34 @@ print('

' . $about_header_title_text . ' :

'); $divider->displayend($divider_end_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($about_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$about_header_title_text]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails diff --git a/templates/earthfluent/view/browse.php b/templates/earthfluent/view/browse.php index 923d5c7..7294d79 100644 --- a/templates/earthfluent/view/browse.php +++ b/templates/earthfluent/view/browse.php @@ -229,57 +229,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/earthfluent/view/display_childof_EarthFluent.com.php b/templates/earthfluent/view/display_childof_EarthFluent.com.php index f7859db..d2c8238 100644 --- a/templates/earthfluent/view/display_childof_EarthFluent.com.php +++ b/templates/earthfluent/view/display_childof_EarthFluent.com.php @@ -930,140 +930,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -2000,169 +1898,14 @@ // ------------------------------------------------------------- - if(!$this->entry['textbody'] && !$textbody_count) - { - // Options Header : Start - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // All Formats - - // ------------------------------------------------------------- - - $formats = [ - [ - text=>'Mobile
Version', - image=>'mobile-icon.jpg', - url=>'view.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - image=>'pdf-file-icon.jpg', - url=>'view.pdf', - ], - [ - text=>'Printer
Friendly', - image=>'printer-friendly-icon.jpg', - url=>'view.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - image=>'plaintext-format-icon.jpg', - url=>'view.txt', - ], - [ - text=>'Wrapped
Plaintext', - image=>'wrapped-plaintext-format-icon.jpg', - url=>'view.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - image=>'colors-inverted-icon.jpg', - url=>'view.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - image=>'rtf-file-icon.jpg', - url=>'view.rtf', - ], - [ - text=>'Epub
File', - image=>'epub-file-icon.jpg', - url=>'view.epub', - ], - [ - text=>'DAISY
Format', - image=>'daisy-format-icon.jpg', - url=>'view.daisy', - ], - [ - text=>'SGML
Format', - image=>'sgml-format-icon.jpg', - url=>'view.sgml', - ], - [ - text=>'JSON
Format', - image=>'json-format-icon.jpg', - url=>'view.json', - ], - [ - text=>'XML
Format', - image=>'xml-format-icon.jpg', - url=>'view.xml', - ], - [ - text=>'CSV
Format', - image=>'csv-format-icon.jpg', - url=>'view.csv', - ], - [ - text=>'Latex
Format', - image=>'latex-format-icon.jpg', - url=>'view.tex', - ], - [ - text=>'OPDS
Format', - image=>'opds-format-icon.jpg', - url=>'view.opds', - ], - [ - text=>'RDF
Format', - image=>'rdf-format-icon.jpg', - url=>'view.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'view.php', - ]; - } - - $formats_count = count($formats); - - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - print('
'); - - if(!$this->mobile_friendly) - { - print('
'); - print(''); - print(''); - print(''); - print('
'); - } - - print('

'); - print(''); - print($format['text']); - print(''); - print('

'); - print('
'); - print('
'); - } - - // Options Header : Finish - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; + if(!$this->entry['textbody'] && !$textbody_count) { + // Alternate Formats Info - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); } // Display Children @@ -2931,22 +2674,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/earthfluent/view/display_grandchildof_EarthFluent.com.php b/templates/earthfluent/view/display_grandchildof_EarthFluent.com.php index aefc09a..fa179a0 100644 --- a/templates/earthfluent/view/display_grandchildof_EarthFluent.com.php +++ b/templates/earthfluent/view/display_grandchildof_EarthFluent.com.php @@ -918,171 +918,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; + // Breadcrumbs Info - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); - - if($quiz_mode) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - if($this->entry['Title']) - { - print($this->entry['Title']); - } - elseif($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } + // ------------------------------------------------------------- - if($this->entry['Subtitle']) - { - print(' : ' . $this->entry['Subtitle']); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - if($quiz_mode) - { - print(''); - print(' >> '); - print(' Quiz Mode'); - - if($previous_quizzes && $future_quizzes) - { - print(' (with Past and Future Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Past Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Future Quizzes)'); - } - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -4907,22 +4774,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/earthfluent/view/display_greatgrandchildof_EarthFluent.com.php b/templates/earthfluent/view/display_greatgrandchildof_EarthFluent.com.php index b823d14..d613f68 100644 --- a/templates/earthfluent/view/display_greatgrandchildof_EarthFluent.com.php +++ b/templates/earthfluent/view/display_greatgrandchildof_EarthFluent.com.php @@ -918,171 +918,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + // Breadcrumbs Info - print(' >> '); - - if($quiz_mode) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - if($this->entry['Title']) - { - print(ucwords($this->entry['Title'])); - } - elseif($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } + // ------------------------------------------------------------- - if($this->entry['Subtitle']) - { - print(' : ' . $this->entry['Subtitle']); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - if($quiz_mode) - { - print(''); - print(' >> '); - print(' Quiz Mode'); - - if($previous_quizzes && $future_quizzes) - { - print(' (with Past and Future Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Past Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Future Quizzes)'); - } - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -4343,22 +4210,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/earthfluent/view/display_index.php b/templates/earthfluent/view/display_index.php index 3b2a149..a8e49b7 100644 --- a/templates/earthfluent/view/display_index.php +++ b/templates/earthfluent/view/display_index.php @@ -120,78 +120,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction diff --git a/templates/earthfluent/view/index_childof_EarthFluent.com.php b/templates/earthfluent/view/index_childof_EarthFluent.com.php index 489023d..c606398 100644 --- a/templates/earthfluent/view/index_childof_EarthFluent.com.php +++ b/templates/earthfluent/view/index_childof_EarthFluent.com.php @@ -930,140 +930,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -2760,22 +2658,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/earthfluent/view/index_grandchildof_EarthFluent.com.php b/templates/earthfluent/view/index_grandchildof_EarthFluent.com.php index 4172654..f34e794 100644 --- a/templates/earthfluent/view/index_grandchildof_EarthFluent.com.php +++ b/templates/earthfluent/view/index_grandchildof_EarthFluent.com.php @@ -12,8 +12,7 @@ $previous_quizzes = (int)$this->Param('previousquizzes'); $future_quizzes = $this->Param('futurequizzes'); - if($previous_quizzes < 1 || $previous_quizzes > 10) - { + if($previous_quizzes < 1 || $previous_quizzes > 10) { $previous_quizzes = 0; } @@ -913,166 +912,54 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Breadcrumb Trails // ------------------------------------------------------------- + // Start Top Bar + + // ------------------------------------------------------------- + print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // Breadcrumbs Info - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - if($quiz_mode) - { - print(''); - } + // ------------------------------------------------------------- + + if($quiz_mode) { + $title = 'Quiz Mode'; - if($this->entry['Title']) - { - print($this->entry['Title']); - } - elseif($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); + if($previous_quizzes && $future_quizzes) { + $title .= ' (with Past and Future Quizzes)'; + } elseif($previous_quizzes) { + $title .= ' (with Past Quizzes)'; + } elseif($previous_quizzes) { + $title .= ' (with Future Quizzes)'; } + } - if($this->entry['Subtitle']) - { - print(' : ' . $this->entry['Subtitle']); - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this, 'title'=>$title]); + $auth->Display(); + + // End Top Bar - if($quiz_mode) - { - print(''); - print(' >> '); - print(' Quiz Mode'); - - if($previous_quizzes && $future_quizzes) - { - print(' (with Past and Future Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Past Quizzes)'); - } - elseif($previous_quizzes) - { - print(' (with Future Quizzes)'); - } - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -4381,22 +4268,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/listkeywords/about/display.php b/templates/listkeywords/about/display.php index 0146e87..925d9aa 100644 --- a/templates/listkeywords/about/display.php +++ b/templates/listkeywords/about/display.php @@ -1187,29 +1187,34 @@ print('

' . $about_header_title_text . ' :

'); $divider->displayend($divider_end_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($about_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$about_header_title_text]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails diff --git a/templates/pronouncethat/about/display.php b/templates/pronouncethat/about/display.php index 07be1be..c80f5fb 100644 --- a/templates/pronouncethat/about/display.php +++ b/templates/pronouncethat/about/display.php @@ -1140,29 +1140,34 @@ print('

' . $about_header_title_text . ' :

'); $divider->displayend($divider_end_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($about_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$about_header_title_text]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlib/view/browse_anarchism.php b/templates/revoltlib/view/browse_anarchism.php index 4352918..c0d06f6 100644 --- a/templates/revoltlib/view/browse_anarchism.php +++ b/templates/revoltlib/view/browse_anarchism.php @@ -115,57 +115,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlib/view/browse_people.php b/templates/revoltlib/view/browse_people.php index ba4e828..8626c5b 100644 --- a/templates/revoltlib/view/browse_people.php +++ b/templates/revoltlib/view/browse_people.php @@ -115,57 +115,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlib/view/display_childof_anarchism.php b/templates/revoltlib/view/display_childof_anarchism.php index ddbd745..4e6a70e 100644 --- a/templates/revoltlib/view/display_childof_anarchism.php +++ b/templates/revoltlib/view/display_childof_anarchism.php @@ -909,140 +909,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + // ------------------------------------------------------------- - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -1904,203 +1802,13 @@ $divider->displayend($clear_float_divider_end_args); - // Options Header - - // ------------------------------------------------------------- - - // Options Header : Start - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Audio Player - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print(''); - print('
'); - print('
'); - print('
'); - print(''); - print('On : '); - print(''); - print(' of '); - print('0'); - print(' Words'); - print(' (Requires Chrome)'); - print(''); - print('
'); - print('
'); - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // All Formats - - // ------------------------------------------------------------- - - $formats = [ - [ - text=>'Mobile
Version', - type=>'mobile', - url=>'view.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - type=>'pdf', - url=>'view.pdf', - ], - [ - text=>'Printer
Friendly', - type=>'printer-friendly', - url=>'view.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - type=>'plaintext', - url=>'view.txt', - ], - [ - text=>'Wrapped
Plaintext', - type=>'wrapped-plaintext', - url=>'view.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - type=>'inverted-colors', - url=>'view.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - type=>'rtf', - url=>'view.rtf', - ], - [ - text=>'Epub
File', - type=>'epub', - url=>'view.epub', - ], - [ - text=>'DAISY
Format', - type=>'daisy', - url=>'view.daisy', - ], - [ - text=>'SGML
Format', - type=>'sgml', - url=>'view.sgml', - ], - [ - text=>'JSON
Format', - type=>'json', - url=>'view.json', - ], - [ - text=>'XML
Format', - type=>'xml', - url=>'view.xml', - ], - [ - text=>'CSV
Format', - type=>'csv', - url=>'view.csv', - ], - [ - text=>'Latex
Format', - type=>'latex', - url=>'view.tex', - ], - [ - text=>'OPDS
Format', - type=>'opds', - url=>'view.opds', - ], - [ - text=>'RDF
Format', - type=>'rdf', - url=>'view.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'view.php', - ]; - } - - $formats_count = count($formats); - - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - - if(!$this->mobile_friendly) - { - print(''); - - print(''); - - print(''); - } - - print('
'); - } - - // Options Header : Finish - - // ------------------------------------------------------------- - - print('
'); - print('
'); + // Alternate Formats Info - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); // Display Textbody @@ -2283,159 +1991,14 @@ if(!$this->entry['textbody'] && !$textbody_count) { - // Options Header : Start - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // All Formats - - // ------------------------------------------------------------- - - $formats = [ - [ - text=>'Mobile
Version', - type=>'mobile', - url=>'view.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - type=>'pdf', - url=>'view.pdf', - ], - [ - text=>'Printer
Friendly', - type=>'printer-friendly', - url=>'view.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - type=>'plaintext', - url=>'view.txt', - ], - [ - text=>'Wrapped
Plaintext', - type=>'wrapped-plaintext', - url=>'view.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - type=>'inverted-colors', - url=>'view.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - type=>'rtf', - url=>'view.rtf', - ], - [ - text=>'Epub
File', - type=>'epub', - url=>'view.epub', - ], - [ - text=>'DAISY
Format', - type=>'daisy', - url=>'view.daisy', - ], - [ - text=>'SGML
Format', - type=>'sgml', - url=>'view.sgml', - ], - [ - text=>'JSON
Format', - type=>'json', - url=>'view.json', - ], - [ - text=>'XML
Format', - type=>'xml', - url=>'view.xml', - ], - [ - text=>'CSV
Format', - type=>'csv', - url=>'view.csv', - ], - [ - text=>'Latex
Format', - type=>'latex', - url=>'view.tex', - ], - [ - text=>'OPDS
Format', - type=>'opds', - url=>'view.opds', - ], - [ - text=>'RDF
Format', - type=>'rdf', - url=>'view.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'view.php', - ]; - } - $formats_count = count($formats); + // Alternate Formats Info - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - - if(!$this->mobile_friendly) - { - print(''); - - print(''); - - print(''); - } - - print('
'); - } - - // Options Header : Finish - - // ------------------------------------------------------------- + // ------------------------------------------------------------- - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); } // Display Children @@ -3347,26 +2910,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - - print('
'); - print(''); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/revoltlib/view/display_childof_people.php b/templates/revoltlib/view/display_childof_people.php index 7b1e3aa..2aabc30 100644 --- a/templates/revoltlib/view/display_childof_people.php +++ b/templates/revoltlib/view/display_childof_people.php @@ -771,131 +771,37 @@ // ------------------------------------------------------------- if($this->authentication_object->user_session['UserAdmin.id']) { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + // ------------------------------------------------------------- - print(' >> '); - print($this->entry['ListTitle']); - } - print('

'); - print('
'); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -1319,203 +1225,13 @@ $divider->displayend($clear_float_divider_end_args); - // Options Header - - // ------------------------------------------------------------- - - // Options Header : Start - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Audio Player - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print(''); - print('
'); - print('
'); - print('
'); - print(''); - print('On : '); - print(''); - print(' of '); - print('0'); - print(' Words'); - print(' (Requires Chrome)'); - print(''); - print('
'); - print('
'); - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // All Formats - - // ------------------------------------------------------------- - - $formats = [ - [ - text=>'Mobile
Version', - type=>'mobile', - url=>'view.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - type=>'pdf', - url=>'view.pdf', - ], - [ - text=>'Printer
Friendly', - type=>'printer-friendly', - url=>'view.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - type=>'plaintext', - url=>'view.txt', - ], - [ - text=>'Wrapped
Plaintext', - type=>'wrapped-plaintext', - url=>'view.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - type=>'inverted-colors', - url=>'view.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - type=>'rtf', - url=>'view.rtf', - ], - [ - text=>'Epub
File', - type=>'epub', - url=>'view.epub', - ], - [ - text=>'DAISY
Format', - type=>'daisy', - url=>'view.daisy', - ], - [ - text=>'SGML
Format', - type=>'sgml', - url=>'view.sgml', - ], - [ - text=>'JSON
Format', - type=>'json', - url=>'view.json', - ], - [ - text=>'XML
Format', - type=>'xml', - url=>'view.xml', - ], - [ - text=>'CSV
Format', - type=>'csv', - url=>'view.csv', - ], - [ - text=>'Latex
Format', - type=>'latex', - url=>'view.tex', - ], - [ - text=>'OPDS
Format', - type=>'opds', - url=>'view.opds', - ], - [ - text=>'RDF
Format', - type=>'rdf', - url=>'view.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'view.php', - ]; - } - - $formats_count = count($formats); + // Alternate Formats Info - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - - if(!$this->mobile_friendly) - { - print(''); - - print(''); - - print(''); - } - - print('
'); - } - - // Options Header : Finish - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); // Display Textbody @@ -2701,25 +2417,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); - print(''); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/revoltlib/view/display_grandchildof_anarchism.php b/templates/revoltlib/view/display_grandchildof_anarchism.php index 84e4e92..2db5544 100644 --- a/templates/revoltlib/view/display_grandchildof_anarchism.php +++ b/templates/revoltlib/view/display_grandchildof_anarchism.php @@ -810,140 +810,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + // ------------------------------------------------------------- - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -1763,203 +1661,13 @@ $divider->displayend($clear_float_divider_end_args); - // Options Header - - // ------------------------------------------------------------- - - // Options Header : Start - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Audio Player - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print(''); - print('
'); - print('
'); - print('
'); - print(''); - print('On : '); - print(''); - print(' of '); - print('0'); - print(' Words'); - print(' (Requires Chrome)'); - print(''); - print('
'); - print('
'); - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // All Formats - - // ------------------------------------------------------------- + // Alternate Formats Info - $formats = [ - [ - text=>'Mobile
Version', - type=>'mobile', - url=>'view.php?mobilefriendly=1', - ], - [ - text=>'PDF
File', - type=>'pdf', - url=>'view.pdf', - ], - [ - text=>'Printer
Friendly', - type=>'printer-friendly', - url=>'view.php?printerfriendly=1', - ], - [ - text=>'Plaintext
File', - type=>'plaintext', - url=>'view.txt', - ], - [ - text=>'Wrapped
Plaintext', - type=>'wrapped-plaintext', - url=>'view.txt?wrapped=1', - ], - [ - text=>'Inverted
Colors', - type=>'inverted-colors', - url=>'view.php?invertedcolors=1', - ], - [ - text=>'RTF
File', - type=>'rtf', - url=>'view.rtf', - ], - [ - text=>'Epub
File', - type=>'epub', - url=>'view.epub', - ], - [ - text=>'DAISY
Format', - type=>'daisy', - url=>'view.daisy', - ], - [ - text=>'SGML
Format', - type=>'sgml', - url=>'view.sgml', - ], - [ - text=>'JSON
Format', - type=>'json', - url=>'view.json', - ], - [ - text=>'XML
Format', - type=>'xml', - url=>'view.xml', - ], - [ - text=>'CSV
Format', - type=>'csv', - url=>'view.csv', - ], - [ - text=>'Latex
Format', - type=>'latex', - url=>'view.tex', - ], - [ - text=>'OPDS
Format', - type=>'opds', - url=>'view.opds', - ], - [ - text=>'RDF
Format', - type=>'rdf', - url=>'view.rdf', - ], - ]; - - if($this->mobile_friendly) - { - $formats[0] = [ - text=>'Standard
PC Format', - image=>'', - url=>'view.php', - ]; - } - - $formats_count = count($formats); - - for($i = 0; $i < $formats_count; $i++) - { - $format = $formats[$i]; - - print('
'); - - if(!$this->mobile_friendly) - { - print(''); - - print(''); - - print(''); - } - - print('
'); - } - - // Options Header : Finish - - // ------------------------------------------------------------- - - print('
'); - print('
'); - - // Finish Textbody Header - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- - $divider->displayend($clear_float_divider_end_args); + require('../modules/html/alternateformats.php'); + $auth = new module_alternateformats(['that'=>$this]); + $auth->Display(); // Display Textbody @@ -1967,8 +1675,7 @@ print('
'); - for($i = 0; $i < $textbody_count; $i++) - { + for($i = 0; $i < $textbody_count; $i++) { $textbody = $this->entry['textbody'][$i]; print('
'); print('
'); @@ -2490,25 +2197,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); - print(''); - - print('
'); if($this->username_record_conflict) { diff --git a/templates/revoltlib/view/display_index.php b/templates/revoltlib/view/display_index.php index 549deaf..cfa76b8 100644 --- a/templates/revoltlib/view/display_index.php +++ b/templates/revoltlib/view/display_index.php @@ -120,79 +120,48 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } + + // Start Top Bar - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- + + print('
'); + + // Login Info - $divider->displaystart($clear_float_divider_start_args); + // ------------------------------------------------------------- - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - $divider->displayend($clear_float_divider_end_args); + // ------------------------------------------------------------- + + print('
'); + + // Finish Breadcrumb Trails - print('
'); - } + // ------------------------------------------------------------- + + $clear_float_divider_start_args = [ + 'class'=>'clear-float', + 'indentlevel'=>5, + ]; + + $divider->displaystart($clear_float_divider_start_args); + + $clear_float_divider_end_args = [ + 'indentlevel'=>5, + ]; + + $divider->displayend($clear_float_divider_end_args); // Introduction @@ -917,24 +886,6 @@ ]; $social_media_share_links = new module_socialmediasharelinks($social_media_share_links_args); - // Start Display Share Options - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('
'); - - // Display "Share" Text - // ------------------------------------------------------- - - print(''); - print(''); - print(''); - print(''); - print(''); - print('
'); - print('
' . 'Share' . ' :
'); - print('		'); // Display Social Networking Options @@ -942,22 +893,6 @@ $social_media_share_links->display(); - // Conclude Table - // ------------------------------------------------------- - - print('
'); - - // End Display Share Options - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('
'); - // Finish Textbody Header // ------------------------------------------------------------- diff --git a/templates/revoltlib/view/index_anarchism.php b/templates/revoltlib/view/index_anarchism.php index b81ba97..1c1444f 100644 --- a/templates/revoltlib/view/index_anarchism.php +++ b/templates/revoltlib/view/index_anarchism.php @@ -115,114 +115,47 @@ 'indentlevel'=>1, ]; - // Admin Controls - - // ------------------------------------------------------------- + // Admin Controls - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + // ------------------------------------------------------------- - // Breadcrumb Trails + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } + + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - print(' >> '); - print($this->entry['ListTitle']); - } - print('

'); - print('
'); + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + print('
'); + + // Finish Breadcrumb Trails + + // ------------------------------------------------------------- $clear_float_divider_start_args = [ 'class'=>'clear-float', diff --git a/templates/revoltlib/view/index_people.php b/templates/revoltlib/view/index_people.php index 17e2839..93de94a 100644 --- a/templates/revoltlib/view/index_people.php +++ b/templates/revoltlib/view/index_people.php @@ -119,110 +119,43 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- - $link_list = ''; + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - print(' >> '); - print($this->entry['ListTitle']); - } - print('

'); - print('
'); + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + print('
'); + + // Finish Breadcrumb Trails + + // ------------------------------------------------------------- $clear_float_divider_start_args = [ 'class'=>'clear-float', diff --git a/templates/revoltlink/view/browse.php b/templates/revoltlink/view/browse.php index 33f78d2..9fa251b 100644 --- a/templates/revoltlink/view/browse.php +++ b/templates/revoltlink/view/browse.php @@ -114,57 +114,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlink/view/browse_grandchildof_inactive.php b/templates/revoltlink/view/browse_grandchildof_inactive.php index b8b9722..035d94f 100644 --- a/templates/revoltlink/view/browse_grandchildof_inactive.php +++ b/templates/revoltlink/view/browse_grandchildof_inactive.php @@ -114,57 +114,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlink/view/display_childof_inactive.php b/templates/revoltlink/view/display_childof_inactive.php index 7eaeef7..1830e15 100644 --- a/templates/revoltlink/view/display_childof_inactive.php +++ b/templates/revoltlink/view/display_childof_inactive.php @@ -119,135 +119,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Finish Admin Controls + // Start Top Bar // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - $divider->displayend($clear_float_divider_end_args); + print('
'); - // "Add" / "Edit" Option + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - print('
'); - - // Finish Admin Controls + // Login Info // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - // Breadcrumb Trails + // End Top Bar // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlink/view/display_childof_revoltlink.php b/templates/revoltlink/view/display_childof_revoltlink.php index a07743c..1830e15 100644 --- a/templates/revoltlink/view/display_childof_revoltlink.php +++ b/templates/revoltlink/view/display_childof_revoltlink.php @@ -119,140 +119,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Finish Admin Controls + // Start Top Bar // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + print('
'); - // "Add" / "Edit" Option + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - // Finish Admin Controls + // Login Info // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - // Breadcrumb Trails + // End Top Bar // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlink/view/display_inactive.php b/templates/revoltlink/view/display_inactive.php index 142a42e..6707a32 100644 --- a/templates/revoltlink/view/display_inactive.php +++ b/templates/revoltlink/view/display_inactive.php @@ -119,78 +119,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction @@ -235,61 +167,32 @@ $divider->displayend($clear_float_divider_end_args); - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Sort Selected Record List diff --git a/templates/revoltlink/view/display_index.php b/templates/revoltlink/view/display_index.php index 44705fc..209e0d7 100644 --- a/templates/revoltlink/view/display_index.php +++ b/templates/revoltlink/view/display_index.php @@ -125,78 +125,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction diff --git a/templates/revoltlink/view/index_childof_inactive.php b/templates/revoltlink/view/index_childof_inactive.php index 44ccdd3..486f2be 100644 --- a/templates/revoltlink/view/index_childof_inactive.php +++ b/templates/revoltlink/view/index_childof_inactive.php @@ -119,78 +119,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction diff --git a/templates/revoltlink/view/index_childof_revoltlink.php b/templates/revoltlink/view/index_childof_revoltlink.php index 6bea705..bd0ae2d 100644 --- a/templates/revoltlink/view/index_childof_revoltlink.php +++ b/templates/revoltlink/view/index_childof_revoltlink.php @@ -115,133 +115,43 @@ 'indentlevel'=>1, ]; - // Admin Controls + // Admin Controls + + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } + + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + print('
'); + + // Breadcrumbs Info - print('
'); - } - - // Breadcrumb Trails + // ------------------------------------------------------------- - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - if($record_list_count) - { - print(''); - } + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - $link_list = ''; + // End Top Bar + + // ------------------------------------------------------------- - print(' >> '); - print($this->entry['ListTitle']); - } - print('

'); - print('
'); - print('
'); - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + print('
'); // View Selected Record List @@ -263,84 +173,6 @@ ]; $header->display($header_secondary_args); - // Admin Controls - - // ------------------------------------------------------------- - - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } - // Introduction // ------------------------------------------------------------- diff --git a/templates/revoltlink/view/index_grandchildof_inactive.php b/templates/revoltlink/view/index_grandchildof_inactive.php index 5e8d38d..fff2e7d 100644 --- a/templates/revoltlink/view/index_grandchildof_inactive.php +++ b/templates/revoltlink/view/index_grandchildof_inactive.php @@ -116,146 +116,43 @@ $divider_end_args = [ 'indentlevel'=>1, ]; + + // Admin Controls + + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Admin Controls + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + print('
'); - // Breadcrumb Trails + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltlink/view/index_grandchildof_revoltlink.php b/templates/revoltlink/view/index_grandchildof_revoltlink.php index f17de7e..6c38e62 100644 --- a/templates/revoltlink/view/index_grandchildof_revoltlink.php +++ b/templates/revoltlink/view/index_grandchildof_revoltlink.php @@ -116,151 +116,43 @@ $divider_end_args = [ 'indentlevel'=>1, ]; + + // Admin Controls + + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Admin Controls + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + print('
'); - // Breadcrumb Trails + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/browse.php b/templates/revoltsource/view/browse.php index 33f78d2..9fa251b 100644 --- a/templates/revoltsource/view/browse.php +++ b/templates/revoltsource/view/browse.php @@ -114,57 +114,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/browse_grandchildof_inactive.php b/templates/revoltsource/view/browse_grandchildof_inactive.php index b8b9722..035d94f 100644 --- a/templates/revoltsource/view/browse_grandchildof_inactive.php +++ b/templates/revoltsource/view/browse_grandchildof_inactive.php @@ -114,57 +114,34 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - - // Breadcrumb Trails - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - if($record_list_count) - { - print(''); - } + // Start Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - print(' >> '); - - $link_list .= '/' . $record['Code']; + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- - print($record['Title']); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(''); - } + // ------------------------------------------------------------- - print(' >> Browsing'); - } - print('

'); - print('
'); - print('
'); + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/display_childof_inactive.php b/templates/revoltsource/view/display_childof_inactive.php index 7eaeef7..1830e15 100644 --- a/templates/revoltsource/view/display_childof_inactive.php +++ b/templates/revoltsource/view/display_childof_inactive.php @@ -119,135 +119,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Finish Admin Controls + // Start Top Bar // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - $divider->displayend($clear_float_divider_end_args); + print('
'); - // "Add" / "Edit" Option + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - print('
'); - - // Finish Admin Controls + // Login Info // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - // Breadcrumb Trails + // End Top Bar // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/display_childof_revoltlink.php b/templates/revoltsource/view/display_childof_revoltlink.php index a07743c..1830e15 100644 --- a/templates/revoltsource/view/display_childof_revoltlink.php +++ b/templates/revoltsource/view/display_childof_revoltlink.php @@ -119,140 +119,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Finish Admin Controls + // Start Top Bar // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); + print('
'); - // "Add" / "Edit" Option + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - // Finish Admin Controls + // Login Info // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - // Breadcrumb Trails + // End Top Bar // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } - - $link_list = ''; - - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } - - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/display_inactive.php b/templates/revoltsource/view/display_inactive.php index 142a42e..9e5988a 100644 --- a/templates/revoltsource/view/display_inactive.php +++ b/templates/revoltsource/view/display_inactive.php @@ -119,78 +119,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction @@ -235,62 +167,50 @@ $divider->displayend($clear_float_divider_end_args); - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); + + // Finish Breadcrumb Trails + + // ------------------------------------------------------------- + + $clear_float_divider_start_args = [ + 'class'=>'clear-float', + 'indentlevel'=>5, + ]; + + $divider->displaystart($clear_float_divider_start_args); + + $clear_float_divider_end_args = [ + 'indentlevel'=>5, + ]; + + $divider->displayend($clear_float_divider_end_args); // Sort Selected Record List diff --git a/templates/revoltsource/view/display_index.php b/templates/revoltsource/view/display_index.php index 44705fc..209e0d7 100644 --- a/templates/revoltsource/view/display_index.php +++ b/templates/revoltsource/view/display_index.php @@ -125,78 +125,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction diff --git a/templates/revoltsource/view/index_childof_inactive.php b/templates/revoltsource/view/index_childof_inactive.php index 44ccdd3..486f2be 100644 --- a/templates/revoltsource/view/index_childof_inactive.php +++ b/templates/revoltsource/view/index_childof_inactive.php @@ -119,78 +119,10 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction diff --git a/templates/revoltsource/view/index_childof_revoltlink.php b/templates/revoltsource/view/index_childof_revoltlink.php index 6bea705..36947f9 100644 --- a/templates/revoltsource/view/index_childof_revoltlink.php +++ b/templates/revoltsource/view/index_childof_revoltlink.php @@ -115,120 +115,47 @@ 'indentlevel'=>1, ]; - // Admin Controls + // Admin Controls + + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } + + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); + print('
'); + + // Breadcrumbs Info - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $divider->displayend($clear_float_divider_end_args); + // ------------------------------------------------------------- - print('
'); - } - - // Breadcrumb Trails + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // End Top Bar + + // ------------------------------------------------------------- - $link_list = ''; + print('

'); - print(' >> '); - print($this->entry['ListTitle']); - } - print('

'); - print('
'); - print('
'); + // Finish Breadcrumb Trails + + // ------------------------------------------------------------- $clear_float_divider_start_args = [ 'class'=>'clear-float', diff --git a/templates/revoltsource/view/index_grandchildof_inactive.php b/templates/revoltsource/view/index_grandchildof_inactive.php index 5e8d38d..f0cf339 100644 --- a/templates/revoltsource/view/index_grandchildof_inactive.php +++ b/templates/revoltsource/view/index_grandchildof_inactive.php @@ -117,145 +117,42 @@ 'indentlevel'=>1, ]; - // Admin Controls - - // ------------------------------------------------------------- + // Admin Controls - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails diff --git a/templates/revoltsource/view/index_grandchildof_revoltlink.php b/templates/revoltsource/view/index_grandchildof_revoltlink.php index f17de7e..6c38e62 100644 --- a/templates/revoltsource/view/index_grandchildof_revoltlink.php +++ b/templates/revoltsource/view/index_grandchildof_revoltlink.php @@ -116,151 +116,43 @@ $divider_end_args = [ 'indentlevel'=>1, ]; + + // Admin Controls + + // ------------------------------------------------------------- + + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); + } - // Admin Controls + // Start Top Bar // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('TRANSFER'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); - } + print('
'); - // Breadcrumb Trails + // Breadcrumbs Info // ------------------------------------------------------------- - print('
'); - print('
'); - print('

'); + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); - - if($record_list_count) - { - print(''); - } + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails diff --git a/templates/sortwords/about/display.php b/templates/sortwords/about/display.php index c9eca4d..c88a669 100644 --- a/templates/sortwords/about/display.php +++ b/templates/sortwords/about/display.php @@ -1099,29 +1099,34 @@ print('

' . $about_header_title_text . ' :

'); $divider->displayend($divider_end_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($about_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$about_header_title_text]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails diff --git a/templates/wordweight/about/display.php b/templates/wordweight/about/display.php index 7f9596d..47e2f40 100644 --- a/templates/wordweight/about/display.php +++ b/templates/wordweight/about/display.php @@ -1191,29 +1191,34 @@ print('

' . $about_header_title_text . ' :

'); $divider->displayend($divider_end_args); - - // Breadcrumb Trails - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('

'); - - if($this->master_record) - { - print(''); - print($this->header_title_text); - print(''); + // Start Top Bar + + // ------------------------------------------------------------- - print(' >> '); + print('

'); - print($about_header_title_text); - } - - print('

'); - print('
'); - print('
'); + // Breadcrumbs Info + + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$about_header_title_text]); + $breadcrumbs->Display(); + + // Login Info + + // ------------------------------------------------------------- + + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar + + // ------------------------------------------------------------- + + print('
'); // Finish Breadcrumb Trails diff --git a/templates/wordweight/view/display_childof_WordWeight.com.php b/templates/wordweight/view/display_childof_WordWeight.com.php index bef0666..ecaa615 100644 --- a/templates/wordweight/view/display_childof_WordWeight.com.php +++ b/templates/wordweight/view/display_childof_WordWeight.com.php @@ -930,105 +930,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); + // Breadcrumbs Info - print(''); + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this, 'title'=>$this->word]); + $breadcrumbs->Display(); + + // Login Info - print($this->master_record['Title']); + // ------------------------------------------------------------- - print(''); - } - - print(' >> '); + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); - print($this->word); + // End Top Bar + + // ------------------------------------------------------------- - print('

'); - print('
'); print('
'); // Finish Breadcrumb Trails diff --git a/templates/wordweight/view/display_index.php b/templates/wordweight/view/display_index.php index 40a730e..86b39d9 100644 --- a/templates/wordweight/view/display_index.php +++ b/templates/wordweight/view/display_index.php @@ -115,83 +115,14 @@ $divider_end_args = [ 'indentlevel'=>1, ]; - // Admin Controls // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('
'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } // Introduction @@ -207,9 +138,9 @@ print('

'); - $definitions_count = $this->dictionary->GetDefinitionsCount([]); - $words_count = $this->dictionary->GetWordsCount([]); - $dictionaries_count = $this->dictionary->GetDictionariesCount([]); + #$definitions_count = $this->dictionary->GetDefinitionsCount([]); + #$words_count = $this->dictionary->GetWordsCount([]); + #$dictionaries_count = $this->dictionary->GetDictionariesCount([]); print('We currently maintain ' . number_format($definitions_count) . ' definitions for ' . number_format($words_count) . ' words'); print('.'); diff --git a/templates/wordweight/view/index_childof_WordWeight.com.php b/templates/wordweight/view/index_childof_WordWeight.com.php index 162456a..075b5c1 100644 --- a/templates/wordweight/view/index_childof_WordWeight.com.php +++ b/templates/wordweight/view/index_childof_WordWeight.com.php @@ -930,140 +930,38 @@ // ------------------------------------------------------------- - if($this->authentication_object->user_session['UserAdmin.id']) - { - print('

'); - // "Controls" Header - - // ------------------------------------------------------------- - - print('
'); - print('
'); - print('
'); - print('

'); - print('Controls for Entry ' . $this->entry['id']); - print('

'); - print('
'); - print('
'); - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - // "Add" / "Edit" Option - - // ------------------------------------------------------------- - - print('
'); - - print('
'); - print('

'); - print('EDIT'); - print('

'); - print('
'); - - print('
'); - print('

'); - print('ADD CHILD'); - print('

'); - print('
'); - - print('
'); - - // Finish Admin Controls - - // ------------------------------------------------------------- - - $clear_float_divider_start_args = [ - 'class'=>'clear-float', - 'indentlevel'=>5, - ]; - - $divider->displaystart($clear_float_divider_start_args); - - $clear_float_divider_end_args = [ - 'indentlevel'=>5, - ]; - - $divider->displayend($clear_float_divider_end_args); - - print('
'); + if($this->authentication_object->user_session['UserAdmin.id']) { + require('../modules/html/entry-controls.php'); + $entry_controls = new module_entrycontrols; + $entry_controls->Display(['that'=>$this]); } - // Breadcrumb Trails + // Start Top Bar // ------------------------------------------------------------- print('
'); - print('
'); - print('

'); - if($this->master_record) - { - $record_list_count = count($this->record_list); - if($record_list_count) - { - print(''); - } - print($this->master_record['Title']); + // Breadcrumbs Info - if($record_list_count) - { - print(''); - } + // ------------------------------------------------------------- + + require('../modules/html/breadcrumbs.php'); + $breadcrumbs = new module_breadcrumbs(['that'=>$this]); + $breadcrumbs->Display(); + + // Login Info - $link_list = ''; + // ------------------------------------------------------------- - for($i = 0; $i < $record_list_count; $i++) - { - $record = $this->record_list[$i]; - if($record['id'] != $this->entry['id']) - { - print(' >> '); - - $link_list .= '/' . $record['Code']; - - print(''); - - print($record['Title']); - - print(''); - } - } + require('../modules/html/auth.php'); + $auth = new module_auth(['that'=>$this]); + $auth->Display(); + + // End Top Bar - print(' >> '); - if($this->entry['ListTitle']) - { - print($this->entry['ListTitle']); - } - elseif($this->entry['Title']) - { - print($this->entry['Title']); - } - } - print('

'); - print('
'); + // ------------------------------------------------------------- + print('
'); // Finish Breadcrumb Trails @@ -2737,22 +2635,6 @@ if($this->authentication_object->user_session) { print('
'); - print('
'); - - $username = ''; - - if($this->authentication_object->user_session['User.Username']) - { - $username = $this->authentication_object->user_session['User.Username']; - } - else - { - $username = $this->authentication_object->user_session['User.EmailAddress']; - } - - print('

Logged in as : ' . $username . ' (Logout)

'); - - print('
'); if($this->username_record_conflict) { diff --git a/traits/scripts/BaseConversion.php b/traits/scripts/BaseConversion.php index be2592b..5985595 100644 --- a/traits/scripts/BaseConversion.php +++ b/traits/scripts/BaseConversion.php @@ -1,17 +1,15 @@ SelectableValue = array(); + public function SetConversionBases() { + $this->SelectableValue = []; - foreach(['Base64', 'Hexadecimal', 'EightBit', 'Binary'] as $base) - { - $this->SelectableValue[] = array( + foreach(['Base64', 'Hexadecimal', 'EightBit', 'Binary'] as $base) { + $this->SelectableValue[] = [ 'optionvalue'=>$base, 'optiontitle'=>$base, 'optionmouseover'=>'Convert to ' . $base, - ); + ]; } return TRUE; diff --git a/traits/scripts/CodeOfConductTrait.php b/traits/scripts/CodeOfConductTrait.php index a0181fd..52cfbc1 100644 --- a/traits/scripts/CodeOfConductTrait.php +++ b/traits/scripts/CodeOfConductTrait.php @@ -12,14 +12,22 @@ public function getCodeOfConduct() { public function getCodeOfConductImages() { $images = [ # image 1 - 'mission'=>[ + 'preface'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/premium-icon/megaphone_13809', - 'original-source'=>'https://www.freepik.com/free-icon/promoting_754744.htm', - 'filename'=>'mission.jpg', + 'source'=>'https://www.flaticon.com/free-icon/coffee-maker_701320?term=prepare&page=1&position=67', + 'original-source'=>'', + 'filename'=>'preface.jpg', ], # image 2 + 'introduction'=>[ + 'creator'=>'Freepik from Flaticon', + 'license'=>'Flaticon Basic License', + 'source'=>'https://www.flaticon.com/free-icon/reunion_1006080?term=introduction&page=1&position=1', + 'original-source'=>'', + 'filename'=>'introduction.jpg', + ], + # image 3 'table-of-contents'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', @@ -28,99 +36,60 @@ public function getCodeOfConductImages() { 'filename'=>'table-of-contents.jpg', ], # image 3 - 'what-data'=>[ - 'creator'=>'Gregor Cresnar from Flaticon', + 'what-is-encouraged'=>[ + 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/id-card_126352', - 'original-source'=>'https://www.freepik.com/free-icon/id-card_934346.htm', - 'filename'=>'what-data.jpg', + 'source'=>'https://www.flaticon.com/free-icon/leaves_113860', + 'original-source'=>'', + 'filename'=>'what-is-encouraged.jpg', ], # image 4 - 'when-collected'=>[ + 'what-is-unacceptable'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/business-presentation_66520', - 'original-source'=>'https://www.freepik.com/free-icon/business-presentation_772506.htm', - 'filename'=>'when-collected.jpg', + 'source'=>'https://www.flaticon.com/free-icon/disabled_2089699?term=prohibited&page=1&position=64', + 'original-source'=>'', + 'filename'=>'what-is-unacceptable.jpg', ], # image 5 - 'how-long-stored'=>[ + 'what-is-unaccountable'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/shelf-full_32152', - 'original-source'=>'https://www.freepik.com/free-icon/shelf-full_740180.htm', - 'filename'=>'how-long-stored.jpg', + 'source'=>'https://www.flaticon.com/free-icon/relationship_1189177?term=accountable&page=1&position=34', + 'original-source'=>'', + 'filename'=>'what-is-unaccountable.jpg', ], # image 6 - 'who-processes'=>[ - 'creator'=>'Gregor Cresnar from Flaticon', + 'how-we-enforce-community-standards'=>[ + 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/networking_126309', - 'original-source'=>'https://www.freepik.com/free-icon/networking_934303.htm', - 'filename'=>'who-processes.jpg', + 'source'=>'https://www.flaticon.com/free-icon/balance_994414?term=law&page=1&position=1', + 'original-source'=>'', + 'filename'=>'how-we-enforce-community-standards.jpg', ], # image 7 - 'data-portability'=>[ + 'licensing'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/wallet_31368', - 'original-source'=>'https://www.freepik.com/free-icon/wallet_739397.htm', - 'filename'=>'data-portability.jpg', + 'source'=>'https://www.flaticon.com/free-icon/open-hanging-signal_44957', + 'original-source'=>'https://www.freepik.com/free-icon/open-hanging-signal_724429.htm', + 'filename'=>'code-of-conduct-license.jpg', ], # image 8 - 'data-editability'=>[ - 'creator'=>'Freepik from Flaticon', - 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/businessman-paper-of-the-application-for-a-job_30382', - 'original-source'=>'https://www.freepik.com/free-icon/businessman-paper-of-the-application-for-a-job_738304.htm', - 'filename'=>'data-editability.jpg', - ], - # image 9 - 'erase-data'=>[ - 'creator'=>'Freepik from Flaticon', - 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/safe-box_31074', - 'original-source'=>'https://www.freepik.com/free-icon/safe-box_739062.htm', - 'filename'=>'erase-data.jpg', - ], - # image 10 - 'privacy-violation'=>[ - 'creator'=>'Freepik from Flaticon', - 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/balance_122112', - 'original-source'=>'https://www.freepik.com/free-icon/balance_924648.htm', - 'filename'=>'privacy-violation.jpg', - ], - # image 11 - 'contact-events'=>[ - 'creator'=>'Freepik from Flaticon', - 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/open-mail_18635', - 'original-source'=>'https://www.freepik.com/free-icon/open-envelope-with-letter_750512.htm', - 'filename'=>'contact-events.jpg', - ], - # image 12 - 'avoided-site-activity'=>[ + 'inspiration'=>[ 'creator'=>'Freepik from Flaticon', 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/insurance_122057', - 'original-source'=>'https://www.freepik.com/free-icon/insurance_924593.htm', - 'filename'=>'avoided-site-activity.jpg', - ], - # image 13 - 'privacy-policy-license'=>[ - 'creator'=>'Freepik from Flaticon', - 'license'=>'Flaticon Basic License', - 'source'=>'https://www.flaticon.com/free-icon/open-hanging-signal_44957', - 'original-source'=>'https://www.freepik.com/free-icon/open-hanging-signal_724429.htm', - 'filename'=>'privacy-policy-license.jpg', + 'source'=>'https://www.flaticon.com/free-icon/lightbulb_2010820?term=inspire&page=1&position=5', + 'original-source'=>'', + 'filename'=>'inspiration.jpg', ], ]; return $images; } - // Privacy Policy Paragraphs + + // Code of Conduct Paragraphs // --------------------------------------------- public function getCodeOfConductParagraphs() { @@ -144,7 +113,7 @@ public function getCodeOfConductParagraphs() { 'headerindex'=>$header_index++, ]) ); - + $code_of_conduct_paragraphs = array_merge($code_of_conduct_paragraphs, $this->getTableOfContentsSection([ @@ -203,8 +172,9 @@ public function getCodeOfConductParagraphs() { return $code_of_conduct_paragraphs; } + - // Individual Privacy Policy Sections + // Individual Code of Conduct Sections // --------------------------------------------- public function getPrefaceSection($args) { @@ -233,7 +203,7 @@ public function getPrefaceSection($args) { '

'; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Version 1.0, 22. Mai 2018, von HoldOffHunger

'; break; case 'es': @@ -243,7 +213,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Versión 1.0, 22 de mayo de 2018, por HoldOffHunger

'; break; case 'fr': @@ -253,7 +223,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Version 1.0, 22 mai 2018, par HoldOffHunger

'; break; case 'ja': @@ -263,7 +233,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

バージョン1.0、2018年5月22日、HoldOffHunger著

'; break; case 'it': @@ -273,7 +243,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Versione 1.0, 22 maggio 2018, di HoldOffHunger

'; break; case 'nl': @@ -283,7 +253,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Versie 1.0, 22 mei 2018, door HoldOffHunger

'; break; case 'pl': @@ -293,7 +263,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Wersja 1.0, 22 maja 2018 roku, przez HoldOffHunger

'; break; case 'pt': @@ -303,7 +273,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Versão 1.0, 22 de maio de 2018, por HoldOffHunger

'; break; case 'ru': @@ -313,7 +283,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Версия 1.0, 22 мая 2018 г., автор HoldOffHunger

'; break; case 'tr': @@ -323,7 +293,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

Sürüm 1.0, 22 Mayıs 2018, HoldOffHunger tarafından

'; break; case 'zh': @@ -333,7 +303,7 @@ public function getPrefaceSection($args) { ''; $preface_section[] = - '

Version 1.0, May 22, 2018, by HoldOffHunger

'; + '

版本1.0，即2018年5月22日，由HoldOffHunger提供

'; break; } @@ -364,24 +334,24 @@ public function getIntroductionSection($args) { $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Einführung'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Jeder erwartet einen Verhaltensstandard. Und jeder wird auf das Verhalten anderer reagieren.

' . + '

Dies trifft immer zu - unabhängig davon, ob Menschen im Rahmen einer gemeinsamen Vereinbarung zusammenarbeiten.

' . + '

Aber durch eine Vereinbarung sollte zumindest die Diskussion einfacher sein.

'; break; case 'es': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introducción'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Todo el mundo espera un estándar de comportamiento. Y todos reaccionarán al comportamiento de los demás.

' . + '

Esto siempre es cierto, ya sea que las personas trabajen juntas o no bajo un acuerdo común.

' . + '

Pero al tener un acuerdo, al menos la discusión debería ser más fácil.

'; break; case 'fr': @@ -391,105 +361,105 @@ public function getIntroductionSection($args) { $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Tout le monde attend une norme de comportement. Et tout le monde réagira au comportement des autres.

' . + "

Cela est toujours vrai, que des personnes travaillent ensemble ou non dans le cadre d'un accord commun.

" . + '

Mais en ayant un accord, au moins la discussion devrait être plus facile.

'; break; case 'ja': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : 前書き'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

誰もが行動の標準を期待しています。 そして、誰もが他人の行動に反応するでしょう。

' . + '

これは常に本当です - 人々が共通の合意の下で一緒に働いているかどうか。

' . + '

しかし、合意することで、少なくとも議論は容易になるはずです。

'; break; case 'it': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduzione'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Tutti si aspettano uno standard di comportamento. E tutti reagiranno al comportamento degli altri.

' . + '

Questo è sempre vero - indipendentemente dal fatto che le persone lavorino o meno in base a un accordo comune.

' . + '

Ma avendo un accordo, almeno la discussione dovrebbe essere più facile.

'; break; case 'nl': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Invoering'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Iedereen verwacht een gedragsnorm. En iedereen zal reageren op het gedrag van anderen.

' . + '

Dit is altijd waar - ongeacht of mensen samenwerken onder een gemeenschappelijk akkoord.

' . + '

Maar door een overeenkomst te hebben, zou tenminste de discussie eenvoudiger moeten zijn.

'; break; case 'pl': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Wprowadzenie'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Wszyscy oczekują standardu zachowania. I każdy zareaguje na zachowanie innych.

' . + '

Jest to zawsze prawdziwe - niezależnie od tego, czy ludzie pracują razem w ramach wspólnej umowy.

' . + '

Ale dzięki porozumieniu przynajmniej dyskusja powinna być łatwiejsza.

'; break; case 'pt': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introdução'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Todos esperam um padrão de comportamento. E todos vão reagir ao comportamento dos outros.

' . + '

Isso é sempre verdade - se as pessoas estão ou não trabalhando juntas sob um acordo comum.

' . + '

Mas, por ter um acordo, pelo menos a discussão deve ser mais fácil.

'; break; case 'ru': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Вступление'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Каждый ожидает стандарт поведения. И каждый будет реагировать на поведение других.

' . + '

Это всегда верно - работают ли люди вместе по общему соглашению.

' . + '

Но при наличии соглашения, по крайней мере, обсуждение должно быть проще.

'; break; case 'tr': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Giriş'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

Herkes standart bir davranış bekler. Ve herkes başkalarının davranışlarına tepki verecektir.

' . + '

Bu her zaman doğrudur - insanların ortak bir anlaşma çerçevesinde birlikte çalışıp çalışmadıklarını.

' . + '

Ancak bir anlaşma yaparak, en azından tartışma daha kolay olmalı.

'; break; case 'zh': $introduction_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : 介绍'; $introduction_section[] = - '

Everyone expects a standard of behavior. And everyone will react to the behavior of others.

' . - '

This is always true -- whether or not people are working together under a common agreement.

' . - '

But by having an agreement, at least discussion should be easier.

'; + '

每个人都期望有一种行为标准。 每个人都会对别人的行为做出反应。

' . + '

这始终是真的 - 无论人们是否在共同协议下共同合作。

' . + '

但通过达成协议，至少讨论应该更容易。

'; break; } @@ -499,6 +469,7 @@ public function getIntroductionSection($args) { public function getTableOfContentsSection($args) { $header_index = $args['headerindex']; $image = $args['image']; + $images = $this->getCodeOfConductImages(); $toc_paragraphs = []; @@ -545,39 +516,446 @@ public function getTableOfContentsSection($args) { break; case 'de': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inhaltsverzeichnis

', + + '

Der anarchistische Verhaltenskodex ist in folgende Abschnitte gegliedert :

' , + + '', + ]; break; case 'es': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Tabla de contenido

', + + '

TEl Código de Conducta Anarquista está organizado en las siguientes secciones :

' , + + '', + ]; break; case 'fr': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Table des matières

', + + '

Le code de conduite anarchiste est organisé dans les sections suivantes :

' , + + '', + ]; break; case 'ja': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 目次

', + + '

アナキスト行動規範は以下のセクションにまとめられています。

' , + + '', + ]; break; case 'it': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Sommario

', + + '

Il codice di condotta anarchico è organizzato nelle seguenti sezioni :

' , + + '', + ]; break; case 'nl': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inhoudsopgave

', + + '

De anarchistische gedragscode is georganiseerd in de volgende secties :

' , + + '', + ]; break; case 'pl': - break; - - case 'pt': - break; - - case 'ru': - break; - - case 'tr': - break; - - case 'zh': - break; - } - + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Spis treści

', + + '

Anarchistyczny kodeks postępowania jest podzielony na następujące sekcje :

' , + + '', + ]; + break; + + case 'pt': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Índice

', + + '

O Código de Conduta Anarquista está organizado nas seguintes seções :

' , + + '', + ]; + break; + + case 'ru': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Оглавление

', + + '

Анархистский Кодекс поведения состоит из следующих разделов :

' , + + '', + ]; + break; + + case 'tr': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : İçindekiler

', + + '

Anarşist Davranış Kuralları aşağıdaki bölümlerde düzenlenmiştir :

' , + + '', + ]; + break; + + case 'zh': + $toc_paragraphs = [ + '

' . + $this->getImageMarkup(['image'=>$images['table-of-contents']]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 目录

', + + '

无政府主义行为准则分为以下几个部分 :

' , + + '', + ]; + break; + } + return $toc_paragraphs; } @@ -591,9 +969,9 @@ public function getWhatIsEncouragedSection($args) { default: case 'en': $what_is_encouraged_section[] = - '

' . + '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : What Is Encouraged'; $what_is_encouraged_section[] = '

Cooperative participation, especially when it is :

'; @@ -629,240 +1007,1884 @@ public function getWhatIsEncouragedSection($args) { break; case 'de': - break; + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Was wird gefördert?

'; - case 'es': - break; + $what_is_encouraged_section[] = + '

Kooperative Beteiligung, insbesondere wenn :

'; - case 'fr': - break; + $what_is_encouraged_section[] = + ''; - case 'ja': - break; + $what_is_encouraged_section[] = + '

Freiwillige Interaktion, insbesondere wenn es umfasst :

'; - case 'it': + $what_is_encouraged_section[] = + ''; break; - case 'nl': - break; + case 'es': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Lo que se alienta

'; - case 'pl': - break; + $what_is_encouraged_section[] = + '

Participación cooperativa, especialmente cuando es :

'; - case 'pt': - break; + $what_is_encouraged_section[] = + ''; - case 'ru': - break; + $what_is_encouraged_section[] = + '

Interacción voluntaria, especialmente cuando incluye :

'; - case 'tr': + $what_is_encouraged_section[] = + ''; break; - case 'zh': - break; - } - - return $what_is_encouraged_section; - } - - public function getWhatIsUnacceptableSection($args) { - $header_index = $args['headerindex']; - $image = $args['image']; - - $what_is_unacceptable_section = []; - - switch($this->language_object->getLanguageCode()) { - default: - case 'en': - $what_is_unacceptable_section[] = - '

' . + case 'fr': + $what_is_encouraged_section[] = + '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unacceptable

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduction'; - $what_is_unacceptable_section[] = - '

Degrading, disrespecting, or insulting another person or group of people, because of their :

'; + $what_is_encouraged_section[] = + '

Participation coopérative, surtout quand il s’agit de :

'; - $what_is_unacceptable_section[] = + $what_is_encouraged_section[] = ''; - $what_is_unacceptable_section[] = - '

Harassment :

'; + $what_is_encouraged_section[] = + '

Interaction volontaire, notamment lorsqu\'elle comprend :

'; - $what_is_unacceptable_section[] = + $what_is_encouraged_section[] = ''; + break; - $what_is_unacceptable_section[] = - '

Unwanted intrusion in public or private atmospheres :

'; + // BT : HERE! - $what_is_unacceptable_section[] = + case 'ja': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 前書き

'; + + $what_is_encouraged_section[] = + '

特に次の場合には、協同参加 :

'; + + // BT: HERE! + + $what_is_encouraged_section[] = ''; - $what_is_unacceptable_section[] = - "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + $what_is_encouraged_section[] = + '

自発的な相互作用、特に以下を含む場合：

'; - $what_is_unacceptable_section[] = + $what_is_encouraged_section[] = ''; + break; - $what_is_unacceptable_section[] = - '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + case 'it': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introduzione

'; - $what_is_unacceptable_section[] = + $what_is_encouraged_section[] = + '

Partecipazione cooperativa, specialmente quando è :

'; + + $what_is_encouraged_section[] = ''; - $what_is_unacceptable_section[] = - '

Advocating or encouraging any of the above.

'; - break; + $what_is_encouraged_section[] = + '

Interazione volontaria, specialmente quando include:

'; - case 'de': + $what_is_encouraged_section[] = + ''; break; - case 'es': - break; + case 'nl': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Invoering

'; - case 'fr': - break; + $what_is_encouraged_section[] = + '

Coöperatieve deelname, vooral als het gaat om :

'; - case 'ja': - break; + $what_is_encouraged_section[] = + ''; - case 'it': - break; + $what_is_encouraged_section[] = + '

Vrijwillige interactie, vooral wanneer deze omvat:

'; - case 'nl': + $what_is_encouraged_section[] = + ''; break; case 'pl': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Wprowadzenie

'; + + $what_is_encouraged_section[] = + '

Współpraca, szczególnie gdy :

'; + + $what_is_encouraged_section[] = + ''; + + $what_is_encouraged_section[] = + '

Dobrowolna interakcja, szczególnie gdy obejmuje:

'; + + $what_is_encouraged_section[] = + ''; break; case 'pt': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Introdução

'; + + $what_is_encouraged_section[] = + '

Participação cooperativa, especialmente quando é :

'; + + $what_is_encouraged_section[] = + ''; + + $what_is_encouraged_section[] = + '

Interação voluntária, especialmente quando inclui:

'; + + $what_is_encouraged_section[] = + ''; break; case 'ru': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Вступление

'; + + $what_is_encouraged_section[] = + '

Совместное участие, особенно когда это :

'; + + $what_is_encouraged_section[] = + ''; + + $what_is_encouraged_section[] = + '

Добровольное взаимодействие, особенно когда оно включает в себя:

'; + + $what_is_encouraged_section[] = + ''; break; case 'tr': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Giriş

'; + + $what_is_encouraged_section[] = + '

Kooperatif katılımı, özellikle :

'; + + $what_is_encouraged_section[] = + ''; + + $what_is_encouraged_section[] = + '

Gönüllü etkileşim, özellikle aşağıdakileri içerdiğinde:

'; + + $what_is_encouraged_section[] = + ''; break; case 'zh': + $what_is_encouraged_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 介绍

'; + + $what_is_encouraged_section[] = + '

合作参与，特别是当它是 ：

'; + + $what_is_encouraged_section[] = + ''; + + $what_is_encouraged_section[] = + '

自愿互动，特别是当它包括：

'; + + $what_is_encouraged_section[] = + ''; break; } - return $what_is_unacceptable_section; + return $what_is_encouraged_section; } - public function getWhatIsUnaccountableSection($args) { + public function getWhatIsUnacceptableSection($args) { $header_index = $args['headerindex']; $image = $args['image']; - $what_is_unaccountable_section = []; + $what_is_unacceptable_section = []; switch($this->language_object->getLanguageCode()) { default: case 'en': - $what_is_unaccountable_section[] = - '

' . + $what_is_unacceptable_section[] = + '

' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unacceptable'; - $what_is_unaccountable_section[] = - '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + $what_is_unacceptable_section[] = + '

Degrading, disrespecting, or insulting another person or group of people, because of their :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'de': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Was ist inakzeptabel

'; + + $what_is_unacceptable_section[] = + '

Eine andere Person oder Gruppe von Menschen herabsetzen, respektlos behandeln oder beleidigen, weil:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Belästigung :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unerwünschtes Eindringen in öffentliche oder private Bereiche :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Politische, soziale oder wirtschaftliche Vorherrschaft, z. B. die Drohung oder nicht einvernehmliche Offenlegung personenbezogener Daten eines anderen für Folgendes:

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Autoritarismus oder die Verbreitung von Verhaltensweisen, die dazu dienen sollen, die bisher beschriebenen Standards zu überschreiten, z. B. Versuche, Folgendes voranzutreiben, zu unterstützen oder zu unterstützen:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Befürwortung oder Ermutigung der oben genannten Punkte.

'; + break; + + case 'es': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Lo que es inaceptable

'; + + $what_is_unacceptable_section[] = + '

Degradar, faltar al respeto o insultar a otra persona o grupo de personas, debido a su:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Acoso :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'fr': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Ce qui est inacceptable

'; + + $what_is_unacceptable_section[] = + '

Dégrader, manquer de respect ou insulter une autre personne ou un groupe de personnes, en raison de:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'ja': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 受け入れられないもの

'; + + $what_is_unacceptable_section[] = + '

以下の理由により、他の人またはグループをDe辱、軽視、or辱します。

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'it': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Cosa è inaccettabile

'; + + $what_is_unacceptable_section[] = + '

Degradare, mancare di rispetto o insultare un\'altra persona o un gruppo di persone, a causa della loro:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'nl': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Wat is onaanvaardbaar

'; + + $what_is_unacceptable_section[] = + '

Een andere persoon of groep mensen vernederen, respectloos maken of beledigen vanwege hun:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'pl': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Co jest niedopuszczalne

'; + + $what_is_unacceptable_section[] = + '

Obrażanie, brak szacunku lub obrażanie innej osoby lub grupy osób z powodu:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'pt': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : O que é inaceitável

'; + + $what_is_unacceptable_section[] = + '

Degradando, desrespeitando ou insultando outra pessoa ou grupo de pessoas, devido a:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'ru': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Что недопустимо

'; + + $what_is_unacceptable_section[] = + '

Унижение, неуважение или оскорбление другого человека или группы людей из-за их:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'tr': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Kabul Edilemez

'; + + $what_is_unacceptable_section[] = + '

Aşağıdakiler nedeniyle başka bir kişiyi veya bir grup insanı aşağılamak, saygısızlık etmek veya aşağılamak:

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + + case 'zh': + $what_is_unacceptable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : 什么是不可接受的

'; + + $what_is_unacceptable_section[] = + '

侮辱，侮辱或侮辱另一个人或一群人，因为：

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Harassment :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Unwanted intrusion in public or private atmospheres :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + "

Political, social, or economic domination, such as threatening to or non-consensually revealing another's personal information to the following :

"; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Authoritarianism, or the spread of behavior that is designed to overturn the standards described so far, such as attempts to advance, support, or aid any of the following :

'; + + $what_is_unacceptable_section[] = + ''; + + $what_is_unacceptable_section[] = + '

Advocating or encouraging any of the above.

'; + break; + } + + return $what_is_unacceptable_section; + } + + public function getWhatIsUnaccountableSection($args) { + $header_index = $args['headerindex']; + $image = $args['image']; + + $what_is_unaccountable_section = []; + + switch($this->language_object->getLanguageCode()) { + default: + case 'en': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'de': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'es': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'fr': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'ja': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'it': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'nl': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'pl': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'pt': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'ru': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'tr': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + + case 'zh': + $what_is_unaccountable_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : What is Unaccountable

'; + + $what_is_unaccountable_section[] = + '

We are one community organization. If your complaint is severe enough, you may need to elevate it beyond what this agreement provides for. You are authorized and encouraged to this if you do not think your complaint can be met with satisfaction.

'; + + $what_is_unaccountable_section[] = + '

You may not cite this document as reason, when :

'; + + $what_is_unaccountable_section[] = + ''; + break; + } + + return $what_is_unaccountable_section; + } + + public function getHowWeEnforceCommunityStandardsSection($args) { + $header_index = $args['headerindex']; + $image = $args['image']; + + $how_we_enforce_community_standards_section = []; + + switch($this->language_object->getLanguageCode()) { + default: + case 'en': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'de': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'es': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'fr': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'ja': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'it': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; + break; + + case 'nl': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; - $what_is_unaccountable_section[] = - '

You may not cite this document as reason, when :

'; + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; - $what_is_unaccountable_section[] = + $how_we_enforce_community_standards_section[] = ''; break; - case 'de': - break; + case 'pl': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; - case 'es': - break; + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; - case 'fr': - break; + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; - case 'ja': + $how_we_enforce_community_standards_section[] = + ''; break; - case 'it': - break; + case 'pt': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; - case 'nl': - break; + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; - case 'pl': - break; + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; - case 'pt': + $how_we_enforce_community_standards_section[] = + ''; break; case 'ru': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; break; case 'tr': + $how_we_enforce_community_standards_section[] = + '

' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : How we Enforce Community Standards

'; + + $how_we_enforce_community_standards_section[] = + '

If you witness or experience any violation of this Code of Conduct, you are urged to immediately contact official organizers within the community.

'; + + $how_we_enforce_community_standards_section[] = + '

In response to violations of unacceptable behavior, we may respond to the offender as follows :

'; + + $how_we_enforce_community_standards_section[] = + ''; break; case 'zh': - break; - } - - return $what_is_unaccountable_section; - } - - public function getHowWeEnforceCommunityStandardsSection($args) { - $header_index = $args['headerindex']; - $image = $args['image']; - - $how_we_enforce_community_standards_section = []; - - switch($this->language_object->getLanguageCode()) { - default: - case 'en': $how_we_enforce_community_standards_section[] = '

' . $this->getImageMarkup(['image'=>$image]) . @@ -881,108 +2903,332 @@ public function getHowWeEnforceCommunityStandardsSection($args) { '
  • Permanent expulsion.
    • ' . ''; break; + } + + return $how_we_enforce_community_standards_section; + } + + public function getLicensingSection($args) { + $header_index = $args['headerindex']; + $image = $args['image']; + + $licensing_section = []; + + switch($this->language_object->getLanguageCode()) { + default: + case 'en': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; + break; case 'de': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'es': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'fr': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'ja': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'it': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'nl': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'pl': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'pt': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'ru': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'tr': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; case 'zh': + $licensing_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + + $licensing_section[] = + '

    This document is released under the Creative Commons Attribution 3.0 License. You may find these terms here...

    '; + + $licensing_section[] = + '
    Creative Commons Attribution 3.0 License (CC-BY License)
    '; break; } - return $how_we_enforce_community_standards_section; + return $licensing_section; } - public function getLicensingSection($args) { + public function getInspirationSection($args) { $header_index = $args['headerindex']; $image = $args['image']; - $introduction_section = []; + $inspiration_section = []; switch($this->language_object->getLanguageCode()) { default: case 'en': - $introduction_section[] = - '

    ' . + $inspiration_section[] = + '

    ' . $this->getImageMarkup(['image'=>$image]) . - $this->getSectionText(['headerindex'=>$header_index]) . ' : Licensing of this Document

    '; + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document'; - $introduction_section[] = - '

    This document is released under the Creative Commons Attribution 3.0 License.

    '; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; case 'de': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; + + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; case 'es': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; + + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; - case 'fr': + case 'fr': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; + + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; case 'ja': - break; - - case 'it': - break; + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; - case 'nl': - break; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; - case 'pl': + $inspiration_section[] = + ''; break; - case 'pt': - break; + case 'it': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; - case 'ru': - break; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; - case 'tr': + $inspiration_section[] = + ''; break; - case 'zh': - break; - } - - return $introduction_section; - } - - public function getInspirationSection($args) { - $header_index = $args['headerindex']; - $image = $args['image']; - - $inspiration_section = []; - - switch($this->language_object->getLanguageCode()) { - default: - case 'en': + case 'nl': $inspiration_section[] = '

    ' . $this->getImageMarkup(['image'=>$image]) . @@ -1006,37 +3252,124 @@ public function getInspirationSection($args) { ''; break; - case 'de': - break; + case 'pl': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; - case 'es': - break; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; - case 'fr': + $inspiration_section[] = + ''; break; - case 'ja': - break; + case 'pt': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; - case 'it': - break; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; - case 'nl': + $inspiration_section[] = + ''; break; - case 'pl': - break; + case 'ru': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; - case 'pt': - break; + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; - case 'ru': + $inspiration_section[] = + ''; break; case 'tr': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; + + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; case 'zh': + $inspiration_section[] = + '

    ' . + $this->getImageMarkup(['image'=>$image]) . + $this->getSectionText(['headerindex'=>$header_index]) . ' : Inspiration for this Document

    '; + + $inspiration_section[] = + '

    This document was inspired by a wide number of other materials, and I owe them all my gratitude! Thank you :

    '; + + $inspiration_section[] = + ''; break; } @@ -1109,17 +3442,6 @@ public function getSectionText($args) { return $section_text; } - public function getImageBaseDirectory() { - $base_directory = '/image/privacy/'; - - if( ($this->script_format_lower == 'pdf') || - ($this->script_format_lower == 'rtf')) { - $base_directory = 'https://www.' . $this->domain_object->host . '.com' . $base_directory; - } - - return $base_directory; - } - public function getImageMarkup($args) { $image = $args['image']; @@ -1165,63 +3487,15 @@ public function getImageIconMarkup($args) { return $markup; } - // HTML Data - // --------------------------------------------- - - public function GetHTMLFormatData_Title() - { - switch($this->language_object->getLanguageCode()) { - default: - case 'en': - $header_title_text = 'Privacy Policy for ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'de': - $header_title_text = 'Datenschutzerklärung für ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'es': - $header_title_text = 'Política de privacidad de ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'fr': - $header_title_text = 'Politique de confidentialité pour ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'ja': - $header_title_text = $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle'] . 'のプライバシーポリシー'; - break; - - case 'it': - $header_title_text = 'Informativa sulla privacy per ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'nl': - $header_title_text = 'Privacybeleid voor ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'pl': - $header_title_text = 'Polityka prywatności dla ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'pt': - $header_title_text = 'Política de Privacidade para ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'ru': - $header_title_text = 'Политика конфиденциальности для ' . $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle']; - break; - - case 'tr': - $header_title_text = $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle'] . ' için Gizlilik Politikası'; - break; - - case 'zh': - $header_title_text = $this->master_record['Title'] . ' : ' . $this->master_record['Subtitle'] . '的隱私政策'; - break; + public function getImageBaseDirectory() { + $base_directory = '/image/code-of-conduct/'; + + if( ($this->script_format_lower == 'pdf') || + ($this->script_format_lower == 'rtf')) { + $base_directory = 'https://www.' . $this->domain_object->host . '.com' . $base_directory; } - return $this->header_title_text = $header_title_text; + return $base_directory; } } diff --git a/traits/scripts/SimpleForms.php b/traits/scripts/SimpleForms.php index 88ef338..03ca104 100644 --- a/traits/scripts/SimpleForms.php +++ b/traits/scripts/SimpleForms.php @@ -11,8 +11,7 @@ public function GenerateEntryListTitle($args) { $entry = $args['entry']; - if(!$entry || !$entry['id']) - { + if(!$entry || !$entry['id']) { $entry = $this->entry; } @@ -77,8 +76,7 @@ public function GenerateEntryListTitle_ExpandNumbers($args) return $list_title; } - public function GenerateEntryListTitle_SubTitle($args) - { + public function GenerateEntryListTitle_SubTitle($args) { $list_title = $args['title']; $list_title = preg_replace('/\s+/', ' ', $list_title); @@ -104,34 +102,25 @@ public function GenerateEntryListTitle_SubTitle($args) $all_list_title_pieces = [$list_title]; $all_list_title_piece_count = count($all_list_title_pieces); - for($i = 0; $i < $explosion_operators_count; $i++) - { + for($i = 0; $i < $explosion_operators_count; $i++) { $explosion_operator = $explosion_operators[$i]; $new_all_list = []; - for($j = 0; $j < $all_list_title_piece_count; $j++) - { + for($j = 0; $j < $all_list_title_piece_count; $j++) { $list_title_piece = $all_list_title_pieces[$j]; $new_title_pieces = explode($explosion_operator, $list_title_piece); $new_title_pieces_count = count($new_title_pieces); - if($new_title_pieces_count <= 1) - { + if($new_title_pieces_count <= 1) { $new_all_list[] = $list_title_piece; - } - else - { - for($k = 0; $k < $new_title_pieces_count; $k++) - { + } else { + for($k = 0; $k < $new_title_pieces_count; $k++) { $new_title_piece = $new_title_pieces[$k]; - if($k + 1 < $new_title_pieces_count) - { + if($k + 1 < $new_title_pieces_count) { $new_all_list[] = $new_title_piece . $special_delimiter . $explosion_operator; - } - else - { + } else { $new_all_list[] = $new_title_piece; } } @@ -144,8 +133,7 @@ public function GenerateEntryListTitle_SubTitle($args) $full_title_text = ''; - for($i = 0; $i < $all_list_title_piece_count; $i++) - { + for($i = 0; $i < $all_list_title_piece_count; $i++) { $list_piece = $all_list_title_pieces[$i]; $list_piece_subpieces = explode(' ', $list_piece); @@ -154,19 +142,16 @@ public function GenerateEntryListTitle_SubTitle($args) $found = 0; - for($j = 0; $j < $title_operators_count; $j++) - { + for($j = 0; $j < $title_operators_count; $j++) { $title_operator = $title_operators[$j]; - if($title_operator == $first_list_subpiece_comparable) - { + if($title_operator == $first_list_subpiece_comparable) { $found = 1; $j = $title_operators_count; } } - if($found) - { + if($found) { $first_title_piece_subpiece = $list_piece_subpieces[0]; unset($list_piece_subpieces[0]); } @@ -177,32 +162,28 @@ public function GenerateEntryListTitle_SubTitle($args) $new_title_piece_reexplode_count = count($new_title_piece_reexplode); $phrase_separator = FALSE; - if($new_title_piece_reexplode_count > 1) - { + if($new_title_piece_reexplode_count > 1) { $phrase_separator = $new_title_piece_reexplode[$new_title_piece_reexplode_count - 1]; unset($new_title_piece_reexplode[$new_title_piece_reexplode_count - 1]); } $new_title_piece = implode($special_delimiter, $new_title_piece_reexplode); - if($found) - { + if($found) { $new_title_piece .= ', ' . $first_title_piece_subpiece; } - if($phrase_separator) - { + if($phrase_separator) { $new_title_piece .= $phrase_separator; } $full_title_text .= $new_title_piece; } - return $full_title_text; + return ucfirst($full_title_text); } - public function GenerateEntryCode() - { + public function GenerateEntryCode() { $pieces = []; $current_length = 0; @@ -213,31 +194,25 @@ public function GenerateEntryCode() $this->entry['Subtitle'], ]; - foreach($this->tag as $tag) - { + foreach($this->tag as $tag) { $values[] = $tag['Tag']; } $values[] = $this->quote['Quote']; $values[] = $this->description['Description']; - for($i = 0; $i < count($values); $i++) - { + for($i = 0; $i < count($values); $i++) { $value = $values[$i]; - if(strlen($value)) - { + if(strlen($value)) { $new_value = $value; $new_value = preg_replace('/[^\p{L}\p{N}\s]/u', '', $new_value); $new_value_pieces = preg_split('/\s+/', $new_value); - foreach($new_value_pieces as $new_value_piece) - { - if($current_length < $max_length) - { + foreach($new_value_pieces as $new_value_piece) { + if($current_length < $max_length) { $formatted_piece = $this->TransliterateString(mb_strtolower(trim($new_value_piece), 'UTF-8')); - if((strlen($formatted_piece) + $current_length + 1) <= $max_length) - { + if((strlen($formatted_piece) + $current_length + 1) <= $max_length) { $pieces[] = $formatted_piece; # print("FORMATTED PIECE???...|" . $formatted_piece . "|"); $current_length += strlen($formatted_piece) + 1; diff --git a/traits/scripts/SimpleImages.php b/traits/scripts/SimpleImages.php index 94e6fb3..688a124 100644 --- a/traits/scripts/SimpleImages.php +++ b/traits/scripts/SimpleImages.php @@ -39,16 +39,19 @@ public function resizeAndSaveFile($args) { } $image->scaleImage($new_width, $new_height); + } else { # image is smaller than absolute icon limits, so, this is its new size. + $new_height = $image_height; + $new_width = $image_width; } $image_icon_filehandle = fopen($new_icon_location, 'w+'); $image->writeImageFile($image_icon_filehandle); $icon_results = [ - originalheight=>$image_height, - originalwidth=>$image_width, - resizedheight=>$new_height, - resizedwidth=>$new_width, + 'originalheight'=>$image_height, + 'originalwidth'=>$image_width, + 'resizedheight'=>$new_height, + 'resizedwidth'=>$new_width, ]; return $icon_results; diff --git a/traits/scripts/URLs.php b/traits/scripts/URLs.php new file mode 100644 index 0000000..70d9647 --- /dev/null +++ b/traits/scripts/URLs.php @@ -0,0 +1,20 @@ +domain_object->primary_domain_lowercased; + + $redirect_domain = preg_replace('/^www\./', '', $redirect_domain); + + if($redirect_domain == $primary_domain) { + return TRUE; + } + + return FALSE; + } + } + +?> \ No newline at end of file