January 2014 - Wine-Commits

Alexander Nicolaysen Sørnes : url: Prevent use of uninitialized variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: e5f5749c737cb2802c0f0c6bedcb6d3bf4f99d99 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e5f5749c737cb2802c0f0c6b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:48:28 2014 +0100 url: Prevent use of uninitialized variable --- include/url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/url.php b/include/url.php index 9f0e3fc..539586a 100644 --- a/include/url.php +++ b/include/url.php @@ -281,7 +281,7 @@ class Url { else $hResult = appData::getData($oApp->iAppId, "url", FALSE); - $sReturn .= html_frame_start("URLs", "90%", "", 0); + $sReturn = html_frame_start("URLs", "90%", "", 0); $sReturn .= "<form method=\"post\" action=\"$sFormAction\">\n"; $sReturn .= html_table_begin("border=0 cellpadding=5 cellspacing=0 width=100%"); $sReturn .= html_tr(array(

1 0

Alexander Nicolaysen Sørnes : editAppFamily: Don't call url functions statically
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 4c87dbe7c4367342b6baff1834bfa52ca95b5c0e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4c87dbe7c4367342b6baff18… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:48:16 2014 +0100 editAppFamily: Don't call url functions statically --- admin/editAppFamily.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index 1908692..6531fb4 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -15,10 +15,12 @@ if(!is_numeric($aClean['iAppId'])) if(!($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isSuperMaintainer($aClean['iAppId']))) util_show_error_page_and_exit("Insufficient Privileges!"); +$oUrl = new Url(); + if(!empty($aClean['sSubmit'])) { process_app_version_changes(false); - url::processForm($aClean); + $oUrl->ProcessForm($aClean); $oApp = new application($aClean['iAppId']); util_redirect_and_exit($oApp->objectMakeUrl()); } @@ -51,7 +53,7 @@ else echo ""; // URL editor - echo url::outputEditor("editAppFamily.php", NULL, $oApp); + echo $oUrl->outputEditor("editAppFamily.php", NULL, $oApp); echo html_back_link(1,$oApp->objectMakeUrl()); }

1 0

Alexander Nicolaysen Sørnes : version: make makeLincenceList non-static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 93bd9dc9c8dc389a541bffa9e2590a5c51ce6c02 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=93bd9dc9c8dc389a541bffa9… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:47:38 2014 +0100 version: make makeLincenceList non-static --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.php b/include/version.php index 7f5d7db..6e4d890 100644 --- a/include/version.php +++ b/include/version.php @@ -1408,7 +1408,7 @@ class version { } // returns a string containing the html for a selection list - public static function makeLicenseList($sLicense = NULL) + public function makeLicenseList($sLicense = NULL) { if(!$sLicense) $sLicense = $this->sLicense;

1 0

Alexander Nicolaysen Sørnes : xinha: Remove unused files
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: b8b3834b4a671582546d661060ebe5f002f6c9dd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b8b3834b4a671582546d6610… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:30:00 2014 +0100 xinha: Remove unused files --- README.xinha_customizations | 29 + xinha/contrib/.htaccess | 11 - xinha/contrib/compress.bat | 7 - xinha/contrib/compress.php | 99 --- xinha/contrib/compress_yui.php | 107 --- xinha/contrib/dojo_js_compressor.jar | Bin 817536 -> 0 bytes xinha/contrib/lc_merge_strings.php | 178 ----- xinha/contrib/lc_parse_strings.php | 325 -------- xinha/contrib/php-xinha.php | 219 ------ xinha/contrib/test_server.py | 61 -- xinha/contrib/yuicompressor-2.4.2.jar | Bin 851219 -> 0 bytes xinha/plugins/CSS/CSS.js | 2 - xinha/plugins/CSSPicker/CSSPicker.js | 2 - xinha/plugins/DefinitionList/DefinitionList.js | 91 --- xinha/plugins/DefinitionList/definition-list.css | 15 - xinha/plugins/DefinitionList/img/ed_dd.gif | Bin 138 -> 0 bytes xinha/plugins/DefinitionList/img/ed_dl.gif | Bin 136 -> 0 bytes xinha/plugins/DefinitionList/img/ed_dt.gif | Bin 149 -> 0 bytes xinha/plugins/DefinitionList/lang/ja.js | 7 - xinha/plugins/DefinitionList/lang/nl.js | 8 - xinha/plugins/DefinitionList/lang/pt_br.js | 20 - xinha/plugins/DoubleClick/DoubleClick.js | 66 -- xinha/plugins/Forms/Forms.js | 2 - xinha/plugins/Forms/forms.css | 3 - xinha/plugins/Forms/img/ed_button.gif | Bin 89 -> 0 bytes xinha/plugins/Forms/img/ed_checkbox.gif | Bin 102 -> 0 bytes xinha/plugins/Forms/img/ed_fieldset.gif | Bin 76 -> 0 bytes xinha/plugins/Forms/img/ed_file.gif | Bin 130 -> 0 bytes xinha/plugins/Forms/img/ed_form.gif | Bin 114 -> 0 bytes xinha/plugins/Forms/img/ed_hidden.gif | Bin 83 -> 0 bytes xinha/plugins/Forms/img/ed_image.gif | Bin 562 -> 0 bytes xinha/plugins/Forms/img/ed_label.gif | Bin 58 -> 0 bytes xinha/plugins/Forms/img/ed_password.gif | Bin 111 -> 0 bytes xinha/plugins/Forms/img/ed_radio.gif | Bin 104 -> 0 bytes xinha/plugins/Forms/img/ed_reset.gif | Bin 97 -> 0 bytes xinha/plugins/Forms/img/ed_select.gif | Bin 111 -> 0 bytes xinha/plugins/Forms/img/ed_submit.gif | Bin 94 -> 0 bytes xinha/plugins/Forms/img/ed_text.gif | Bin 112 -> 0 bytes xinha/plugins/Forms/img/ed_textarea.gif | Bin 115 -> 0 bytes xinha/plugins/Forms/lang/ja.js | 86 -- xinha/plugins/Forms/lang/nl.js | 87 -- xinha/plugins/Forms/lang/pt_br.js | 83 -- xinha/plugins/Forms/popups/fieldset.html | 45 -- xinha/plugins/Forms/popups/form.html | 89 --- xinha/plugins/Forms/popups/input.html | 179 ----- xinha/plugins/Forms/popups/label.html | 58 -- xinha/plugins/Forms/popups/select.html | 208 ----- xinha/plugins/Forms/popups/textarea.html | 112 --- xinha/plugins/GetHtml/GetHtml.js | 17 - xinha/plugins/HorizontalRule/HorizontalRule.js | 2 - xinha/plugins/HorizontalRule/lang/de.js | 21 - xinha/plugins/HorizontalRule/lang/fr.js | 20 - xinha/plugins/HorizontalRule/lang/ja.js | 21 - xinha/plugins/HorizontalRule/lang/nb.js | 21 - xinha/plugins/HorizontalRule/lang/nl.js | 21 - xinha/plugins/HorizontalRule/lang/pt_br.js | 34 - .../popups/edit_horizontal_rule.html | 141 ---- xinha/plugins/HtmlEntities/Entities.js | 204 ----- xinha/plugins/HtmlEntities/HtmlEntities.js | 51 -- xinha/plugins/HtmlEntities/iso-8859-1.js | 109 --- xinha/plugins/InsertAnchor/InsertAnchor.js | 2 - xinha/plugins/InsertAnchor/dialog.html | 14 - xinha/plugins/InsertAnchor/img/insert-anchor.gif | Bin 370 -> 0 bytes xinha/plugins/InsertAnchor/img/placeholder.gif | Bin 834 -> 0 bytes xinha/plugins/InsertAnchor/insert-anchor.css | 8 - xinha/plugins/InsertAnchor/lang/de.js | 8 - xinha/plugins/InsertAnchor/lang/fr.js | 7 - xinha/plugins/InsertAnchor/lang/ja.js | 7 - xinha/plugins/InsertAnchor/lang/nb.js | 7 - xinha/plugins/InsertAnchor/lang/nl.js | 8 - xinha/plugins/InsertAnchor/lang/pl.js | 8 - xinha/plugins/InsertAnchor/lang/pt_br.js | 22 - .../plugins/InsertAnchor/popups/insert_anchor.html | 59 -- xinha/plugins/InsertNote/InsertNote.js | 2 - xinha/plugins/InsertNote/dialog.html | 12 - xinha/plugins/InsertNote/img/insert-note.gif | Bin 627 -> 0 bytes xinha/plugins/InsertPagebreak/InsertPagebreak.js | 43 - xinha/plugins/InsertPagebreak/img/pagebreak.gif | Bin 105 -> 0 bytes xinha/plugins/InsertPagebreak/lang/de.js | 6 - xinha/plugins/InsertPagebreak/lang/fr.js | 5 - xinha/plugins/InsertPagebreak/lang/ja.js | 5 - xinha/plugins/InsertPagebreak/lang/nb.js | 6 - xinha/plugins/InsertPagebreak/lang/nl.js | 6 - xinha/plugins/InsertPagebreak/lang/pt_br.js | 18 - xinha/plugins/InsertSnippet/InsertSnippet.css | 93 --- xinha/plugins/InsertSnippet/InsertSnippet.js | 92 --- xinha/plugins/InsertSnippet/demosnippets.js | 15 - xinha/plugins/InsertSnippet/img/ed_snippet.gif | Bin 606 -> 0 bytes xinha/plugins/InsertSnippet/lang/de.js | 10 - xinha/plugins/InsertSnippet/lang/ja.js | 10 - xinha/plugins/InsertSnippet/lang/nb.js | 11 - xinha/plugins/InsertSnippet/lang/nl.js | 11 - xinha/plugins/InsertSnippet/lang/pt_br.js | 25 - .../InsertSnippet/popups/insertsnippet.html | 133 ---- xinha/plugins/InsertSnippet/readme.html | 57 -- xinha/plugins/InsertSnippet/snippets.html | 29 - xinha/plugins/InsertSnippet/snippets.php | 22 - xinha/plugins/InsertSnippet2/InsertSnippet.css | 92 --- xinha/plugins/InsertSnippet2/InsertSnippet2.js | 2 - xinha/plugins/InsertSnippet2/dialog.html | 20 - xinha/plugins/InsertSnippet2/img/1.PNG | Bin 267 -> 0 bytes xinha/plugins/InsertSnippet2/img/10.PNG | Bin 258 -> 0 bytes xinha/plugins/InsertSnippet2/img/11.PNG | Bin 294 -> 0 bytes xinha/plugins/InsertSnippet2/img/12.PNG | Bin 260 -> 0 bytes xinha/plugins/InsertSnippet2/img/13.PNG | Bin 263 -> 0 bytes xinha/plugins/InsertSnippet2/img/14.PNG | Bin 272 -> 0 bytes xinha/plugins/InsertSnippet2/img/15.PNG | Bin 261 -> 0 bytes xinha/plugins/InsertSnippet2/img/16.PNG | Bin 257 -> 0 bytes xinha/plugins/InsertSnippet2/img/2.PNG | Bin 255 -> 0 bytes xinha/plugins/InsertSnippet2/img/3.PNG | Bin 272 -> 0 bytes xinha/plugins/InsertSnippet2/img/4.PNG | Bin 265 -> 0 bytes xinha/plugins/InsertSnippet2/img/5.PNG | Bin 261 -> 0 bytes xinha/plugins/InsertSnippet2/img/6.PNG | Bin 275 -> 0 bytes xinha/plugins/InsertSnippet2/img/7.PNG | Bin 262 -> 0 bytes xinha/plugins/InsertSnippet2/img/8.PNG | Bin 282 -> 0 bytes xinha/plugins/InsertSnippet2/img/9.PNG | Bin 268 -> 0 bytes xinha/plugins/InsertSnippet2/img/ed_snippet.gif | Bin 606 -> 0 bytes xinha/plugins/InsertSnippet2/lang/de.js | 12 - xinha/plugins/InsertSnippet2/readme.html | 51 -- xinha/plugins/InsertSnippet2/snippets.php | 37 - xinha/plugins/InsertSnippet2/snippets.xml | 42 - xinha/plugins/Linker/Linker.js | 2 - xinha/plugins/Linker/dTree/api.html | 252 ------ xinha/plugins/Linker/dTree/dtree.css | 41 - xinha/plugins/Linker/dTree/dtree.js | 2 - xinha/plugins/Linker/dTree/example01.html | 53 -- xinha/plugins/Linker/dTree/img/base.gif | Bin 1018 -> 0 bytes xinha/plugins/Linker/dTree/img/cd.gif | Bin 228 -> 0 bytes xinha/plugins/Linker/dTree/img/copy.gif | Bin 641 -> 0 bytes xinha/plugins/Linker/dTree/img/empty.gif | Bin 62 -> 0 bytes xinha/plugins/Linker/dTree/img/folder.gif | Bin 355 -> 0 bytes xinha/plugins/Linker/dTree/img/folderopen.gif | Bin 365 -> 0 bytes xinha/plugins/Linker/dTree/img/globe.gif | Bin 1080 -> 0 bytes xinha/plugins/Linker/dTree/img/imgfolder.gif | Bin 609 -> 0 bytes xinha/plugins/Linker/dTree/img/join.gif | Bin 62 -> 0 bytes xinha/plugins/Linker/dTree/img/joinbottom.gif | Bin 55 -> 0 bytes xinha/plugins/Linker/dTree/img/line.gif | Bin 46 -> 0 bytes xinha/plugins/Linker/dTree/img/minus.gif | Bin 82 -> 0 bytes xinha/plugins/Linker/dTree/img/minusbottom.gif | Bin 76 -> 0 bytes xinha/plugins/Linker/dTree/img/move.gif | Bin 653 -> 0 bytes xinha/plugins/Linker/dTree/img/musicfolder.gif | Bin 626 -> 0 bytes xinha/plugins/Linker/dTree/img/nolines_minus.gif | Bin 64 -> 0 bytes xinha/plugins/Linker/dTree/img/nolines_plus.gif | Bin 67 -> 0 bytes xinha/plugins/Linker/dTree/img/offline.gif | Bin 1001 -> 0 bytes xinha/plugins/Linker/dTree/img/offline.png | Bin 922 -> 0 bytes xinha/plugins/Linker/dTree/img/page.gif | Bin 556 -> 0 bytes xinha/plugins/Linker/dTree/img/plus.gif | Bin 86 -> 0 bytes xinha/plugins/Linker/dTree/img/plusbottom.gif | Bin 82 -> 0 bytes xinha/plugins/Linker/dTree/img/question.gif | Bin 1034 -> 0 bytes xinha/plugins/Linker/dTree/img/trash.gif | Bin 1036 -> 0 bytes xinha/plugins/Linker/dialog.html | 103 --- xinha/plugins/Linker/lang/de.js | 19 - xinha/plugins/Linker/lang/fr.js | 18 - xinha/plugins/Linker/lang/ja.js | 24 - xinha/plugins/Linker/lang/nb.js | 7 - xinha/plugins/Linker/lang/nl.js | 7 - xinha/plugins/Linker/lang/pl.js | 19 - xinha/plugins/Linker/lang/pt_br.js | 43 - xinha/plugins/Linker/link-picker.js | 2 - xinha/plugins/Linker/pluginMethods.js | 2 - xinha/plugins/Linker/scan.php | 114 --- xinha/plugins/PSFixed/PSFixed.js | 2 - xinha/plugins/PSLocal/PSLocal.js | 2 - xinha/plugins/PSLocal/dialog.html | 6 - xinha/plugins/PSLocal/gears_init.js | 2 - xinha/plugins/PSServer/PSServer.js | 2 - xinha/plugins/PSServer/backend.php | 830 -------------------- xinha/plugins/PSServer/config.inc.php | 194 ----- xinha/plugins/PSServer/demo_images/.htaccess | 2 - xinha/plugins/PSServer/demo_images/bikerpeep.jpg | Bin 27684 -> 0 bytes xinha/plugins/PSServer/demo_images/linux/linux.gif | Bin 11803 -> 0 bytes xinha/plugins/PSServer/demo_images/wesnoth078.jpg | Bin 8460 -> 0 bytes xinha/plugins/PasteText/PasteText.js | 2 - xinha/plugins/PasteText/img/ed_paste_text.gif | Bin 381 -> 0 bytes xinha/plugins/PasteText/lang/de.js | 6 - xinha/plugins/PasteText/lang/fr.js | 5 - xinha/plugins/PasteText/lang/ja.js | 5 - xinha/plugins/PasteText/lang/nb.js | 6 - xinha/plugins/PasteText/lang/nl.js | 6 - xinha/plugins/PasteText/lang/pl.js | 6 - xinha/plugins/PasteText/lang/pt_br.js | 21 - xinha/plugins/PasteText/lang/ru.js | 5 - xinha/plugins/PasteText/popups/paste_text.html | 9 - .../plugins/PersistentStorage/PersistentStorage.js | 2 - xinha/plugins/PersistentStorage/dialog.html | 126 --- xinha/plugins/PreserveScripts/PreserveScripts.js | 68 -- xinha/plugins/PreserveScripts/js.png | Bin 730 -> 0 bytes xinha/plugins/PreserveScripts/php.png | Bin 698 -> 0 bytes xinha/plugins/PreserveScripts/php.svg | 152 ---- xinha/plugins/QuickTag/QuickTag.js | 53 -- xinha/plugins/QuickTag/img/ed_quicktag.gif | Bin 82 -> 0 bytes xinha/plugins/QuickTag/lang/de.js | 16 - xinha/plugins/QuickTag/lang/fr.js | 16 - xinha/plugins/QuickTag/lang/ja.js | 16 - xinha/plugins/QuickTag/lang/nb.js | 17 - xinha/plugins/QuickTag/lang/nl.js | 17 - xinha/plugins/QuickTag/lang/pl.js | 17 - xinha/plugins/QuickTag/lang/pt_br.js | 30 - xinha/plugins/QuickTag/popups/quicktag.html | 354 --------- xinha/plugins/QuickTag/tag-lib.js | 2 - xinha/plugins/SaveOnBlur/SaveOnBlur.js | 47 -- xinha/plugins/SaveSubmit/README.txt | 15 - xinha/plugins/SaveSubmit/SaveSubmit.js | 2 - xinha/plugins/SaveSubmit/img/ed_save_green.gif | Bin 208 -> 0 bytes xinha/plugins/SaveSubmit/img/ed_save_red.gif | Bin 207 -> 0 bytes xinha/plugins/SaveSubmit/lang/de.js | 8 - xinha/plugins/SaveSubmit/lang/fr.js | 8 - xinha/plugins/SaveSubmit/lang/ja.js | 8 - xinha/plugins/SaveSubmit/lang/nl.js | 9 - xinha/plugins/SaveSubmit/lang/pt_br.js | 21 - xinha/plugins/SaveSubmit/lang/ru.js | 9 - xinha/plugins/SetId/SetId.js | 88 --- xinha/plugins/SetId/img/placeholder.gif | Bin 834 -> 0 bytes xinha/plugins/SetId/img/set-id.gif | Bin 370 -> 0 bytes xinha/plugins/SetId/lang/de.js | 8 - xinha/plugins/SetId/lang/ja.js | 9 - xinha/plugins/SetId/lang/nb.js | 8 - xinha/plugins/SetId/lang/nl.js | 10 - xinha/plugins/SetId/lang/pt_br.js | 25 - xinha/plugins/SetId/popups/set_id.html | 58 -- xinha/plugins/SetId/set-id.css | 7 - xinha/plugins/SmartReplace/SmartReplace.js | 2 - xinha/plugins/SmartReplace/dialog.html | 16 - xinha/plugins/SmartReplace/img/SmartReplace.svg | 231 ------ xinha/plugins/SmartReplace/img/smartquotes.png | Bin 999 -> 0 bytes xinha/plugins/SmartReplace/lang/de.js | 19 - xinha/plugins/SmartReplace/lang/fr.js | 13 - xinha/plugins/SmartReplace/lang/ja.js | 19 - xinha/plugins/SmartReplace/lang/nl.js | 20 - xinha/plugins/SmartReplace/lang/pt_br.js | 24 - xinha/plugins/SmartReplace/readme.txt | 15 - xinha/plugins/UnFormat/UnFormat.js | 107 --- xinha/plugins/UnFormat/dialog.html | 28 - xinha/plugins/UnFormat/img/unformat.gif | Bin 136 -> 0 bytes xinha/plugins/UnFormat/lang/de.js | 12 - xinha/plugins/UnFormat/lang/fr.js | 12 - xinha/plugins/UnFormat/lang/ja.js | 12 - xinha/plugins/UnFormat/lang/nb.js | 13 - xinha/plugins/UnFormat/lang/nl.js | 12 - xinha/plugins/UnFormat/lang/pt_br.js | 27 - xinha/plugins/UnsavedChanges/UnsavedChanges.js | 55 -- xinha/plugins/UnsavedChanges/lang/es.js | 5 - xinha/plugins/UnsavedChanges/lang/fr.js | 5 - xinha/plugins/UnsavedChanges/lang/fr_ca.js | 5 - xinha/plugins/WysiwygWrap/WysiwygWrap.js | 101 --- 245 files changed, 29 insertions(+), 7647 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=b8b3834b4a671582546d…

1 0

Alexander Nicolaysen Sørnes : help: Replace ereg with preg_match
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 8b0a6b6198ba673d1e468cb9aecfe51ec92f9fe7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8b0a6b6198ba673d1e468cb9… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:52:28 2014 +0100 help: Replace ereg with preg_match --- help/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/index.php b/help/index.php index f366671..ded67c0 100644 --- a/help/index.php +++ b/help/index.php @@ -42,10 +42,10 @@ function display_index () // display dir while (list($key,$file) = each($files)) { - if(!ereg("(.+)\\.help$", $file, $arr)) + if(!preg_match("(([^.]+).help)", $file, $aMatches)) continue; - $id = $arr[1]; + $id = $aMatches[1]; $title = get_help_title("$help_path/$file"); echo " <li> <a href=\"".BASE."help?sTopic=$id\" style=\"cursor: help\"> $title </a></li>\n"; @@ -95,9 +95,9 @@ function get_help_title ($file) $line = trim($line); - if(eregi("^$", $line, $arr)) + if(preg_match("/^$/i", $line, $aMatches)) { - return $arr[1]; + return $aMatches[1]; } return "Internal Error: missing title"; }

1 0

Alexander Nicolaysen Sørnes : mail: Replace deprecated ereg_replace with str_replace
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 9c5b79818e753049001bd0b4553c4c7781e67682 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9c5b79818e753049001bd0b4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:59:30 2014 +0100 mail: Replace deprecated ereg_replace with str_replace --- include/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mail.php b/include/mail.php index 1c8fb65..90223aa 100644 --- a/include/mail.php +++ b/include/mail.php @@ -16,7 +16,7 @@ function mail_appdb($sEmailList,$sSubject,$sMsg) $sHeaders .= "Bcc: $sEmailListComma\r\n"; $sHeaders .= "X-Priority: 3\r\n"; $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n"; - $sMsg = trim(ereg_replace("\r\n","\n",$sMsg)); + $sMsg = trim(str_replace("\r\n","\n",$sMsg)); $sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n"; $sMsg .= "Best regards.\n"; $sMsg .= "The AppDB team\n";

1 0

Alexander Nicolaysen Sørnes : parsedate.php: Remove unused file
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: bbd72f3aa6472513e066613215be03b7d36e117b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bbd72f3aa6472513e0666132… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:03:09 2014 +0100 parsedate.php: Remove unused file --- include/parsedate.php | 84 ------------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/include/parsedate.php b/include/parsedate.php deleted file mode 100644 index 01bc585..0000000 --- a/include/parsedate.php +++ /dev/null @@ -1,84 +0,0 @@ -<?php - -function parsedate($datestr) -{ - $daynames = array("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"); - $monthnames = array("jan" => 1, "feb" => 2, "mar" => 3, "apr" => 4, "may" => 5, "jun" => 6, - "jul" => 7, "aug" => 8, "sep" => 9, "oct" => 10, "nov" => 11, "dec" => 12); - $ampm = array("am" => 00, "pm" => 12); - - if(!$datestr) - return -1; - - $datestr = strtolower($datestr); - $datestr = ereg_replace("[,]", "", $datestr); - $dp = explode(' ', $datestr); - while(list($idx, $part) = each($dp)) - { - //echo "PART($part) "; - - /* 23:59:59 */ - if(ereg("^([0-9]+):([0-9]+):([0-9]+)$", $part, $arr)) - { - $hour = $arr[1]; - $minute = $arr[2]; - $second = $arr[3]; - continue; - } - - /* 23:59 */ - if(ereg("^([0-9]+):([0-9]+)$", $part, $arr)) - { - $hour = $arr[1]; - $minute = $arr[2]; - $second = 0; - continue; - } - - /* 2000-12-31 (mysql date format) */ - if(ereg("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$", $part, $arr)) - { - $year = $arr[1]; - $month = $arr[2]; - $day = $arr[3]; - continue; - } - - if(defined($ampm[$part])) - { - $hour += $ampm[$part]; - continue; - } - - if($monthnames[substr($part, 0, 3)]) - { - $month = $monthnames[substr($part, 0, 3)]; - continue; - } - - if($part > 1900) - { - $year = $part; - continue; - } - - if($part > 31) - { - $year = 1900 + $part; - continue; - } - - if($part >= 1 && $part <= 31) - { - $day = $part; - continue; - } - - //echo "Unparsed: '$part' \n"; - - } - - return mktime($hour, $minute, $second, $month, $day, $year); -} - -?>

1 0

Alexander Nicolaysen Sørnes : comment: Replace eregi with stripos
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 59a5b978e8c1e9bb49966c2f7513cf25dcac333c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=59a5b978e8c1e9bb49966c2f… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:56:09 2014 +0100 comment: Replace eregi with stripos --- include/comment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/comment.php b/include/comment.php index a364d76..21c6a14 100644 --- a/include/comment.php +++ b/include/comment.php @@ -835,7 +835,7 @@ class Comment { if(!$this->sSubject) { // Only add RE: once - if(eregi("RE:", $oRow->subject)) + if(stripos($oRow->subject, "RE:") !== false) $this->sSubject = $oRow->subject; else $this->sSubject = "RE: ".$oRow->subject;

1 0

Alexander Nicolaysen Sørnes : html: Replace ereg_replace with str_replace
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: decbd736c4ada6172bcef8955e333a7d68b6d533 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=decbd736c4ada6172bcef895… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:58:19 2014 +0100 html: Replace ereg_replace with str_replace --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index 21992ae..b015f9f 100644 --- a/include/html.php +++ b/include/html.php @@ -237,7 +237,7 @@ function p() function add_br($text = "") { - $text = ereg_replace("\n"," \n",$text); + $text = str_replace("\n"," \n",$text); return $text; }

1 0

Alexander Nicolaysen Sørnes : TableRowSortable: Override TableRow::AddCell()
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: bf7127801b1fa08795c92de076844854b2ac6683 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bf7127801b1fa08795c92de0… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 16:53:46 2014 +0100 TableRowSortable: Override TableRow::AddCell() --- include/table.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/table.php b/include/table.php index 362d605..f0c31fb 100644 --- a/include/table.php +++ b/include/table.php @@ -313,7 +313,7 @@ class TableRowSortable extends TableRow } /* Adds a table cell without sorting */ - function AddTableCell(TableCell $oCell) + function AddCell(TableCell $oCell) { $this->aTableCells[] = $oCell; $this->aSortVars[] = ''; @@ -322,7 +322,7 @@ class TableRowSortable extends TableRow /* Adds a text cell without sorting */ function AddTextCell($shText) { - $this->AddTableCell(new TableCell($shText)); + $this->AddCell(new TableCell($shText)); } /* Adds a text cell with a sorting var */

1 0