Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 111566 Details for
Bug 77651
VHCS: Virtual Hosting Control System (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
vhcs-2.4.7.1-php5.patch
vhcs-2.4.7.1-php5.patch (text/plain), 18.01 KB, created by
MT
on 2007-02-28 15:04:37 UTC
(
hide
)
Description:
vhcs-2.4.7.1-php5.patch
Filename:
MIME Type:
Creator:
MT
Created:
2007-02-28 15:04:37 UTC
Size:
18.01 KB
patch
obsolete
>--- gui/include/vhcs-lib.php 2006-01-03 20:57:42.000000000 +0100 >+++ gui/include/vhcs-lib.php 2007-01-06 11:44:07.102198063 +0100 >@@ -19,8 +19,8 @@ > > session_start(); > >-error_reporting(0); >-//error_reporting(E_ALL); // setting for development edition - see all error messages >+//error_reporting(0); >+error_reporting(E_ALL); // setting for development edition - see all error messages > > $include_path = realpath(dirname(__FILE__)); > >--- gui/include/reseller-functions.php 2005-12-31 12:09:05.000000000 +0100 >+++ gui/include/reseller-functions.php 2007-01-06 13:26:38.438773100 +0100 >@@ -475,7 +475,7 @@ > $sql_db_current = records_count('sqld_id', 'sql_database', 'domain_id', $user_id); > $sql_db_max = $data['domain_sqld_limit']; > >- $sql_user_current = get_domain_running_sqlu_acc_cnt(&$sql, $user_id); >+ $sql_user_current = get_domain_running_sqlu_acc_cnt($sql, $user_id); > > $sql_user_max = $data['domain_sqlu_limit']; > >--- gui/admin/reseller_statistics.php 2005-12-31 12:10:51.000000000 +0100 >+++ gui/admin/reseller_statistics.php 2007-01-06 14:25:00.021584688 +0100 >@@ -354,7 +354,7 @@ > > gen_admin_menu($tpl); > >-generate_page ( &$tpl ); >+generate_page ($tpl); > > $tpl -> assign( > array( >@@ -384,4 +384,4 @@ > if (isset($cfg['DUMP_GUI_DEBUG'])) dump_gui_debug(); > > unset_messages(); >-?> >\ No newline at end of file >+?> >--- gui/admin/circular.php 2005-12-31 12:10:50.000000000 +0100 >+++ gui/admin/circular.php 2007-01-06 14:36:56.419293726 +0100 >@@ -202,7 +202,7 @@ > > if (check_user_data($tpl)) { > >- send_reseller_message( &$sql); >+ send_reseller_message($sql); > > unset($_POST['uaction']); > >@@ -296,7 +296,7 @@ > ) > ); > >-send_circular(&$tpl, &$sql); >+send_circular($tpl, $sql); > > gen_page_data ($tpl, $sql); > >@@ -309,4 +309,4 @@ > if (isset($cfg['DUMP_GUI_DEBUG'])) dump_gui_debug(); > > unset_messages(); >-?> >\ No newline at end of file >+?> >--- gui/admin/edit_reseller.php 2005-12-31 12:10:49.000000000 +0100 >+++ gui/admin/edit_reseller.php 2007-01-06 14:56:55.442375237 +0100 >@@ -829,7 +829,7 @@ > $max_traff_amnt, $current_traff_amnt, > $max_disk_amnt, $current_disk_amnt, > $customer_id, $rip_lst >-) = get_reseller_prop(&$sql); >+) = get_reseller_prop($sql); > > $reseller_ips = get_servers_IPs($tpl, $sql, $rip_lst); > >--- gui/tools/webmail/addressbook.php 2005-12-31 12:01:57.000000000 +0100 >+++ gui/tools/webmail/addressbook.php 2007-01-08 16:00:11.589157840 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -167,4 +167,4 @@ > > $smarty->display("$selected_theme/$templatename"); > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/apply_filters.php 2005-12-31 12:01:59.000000000 +0100 >+++ gui/tools/webmail/apply_filters.php 2007-01-08 16:01:53.460616711 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > > if($folder == $sess["sysmap"]["inbox"] && $allow_filters) { > >@@ -85,4 +85,4 @@ > } > reset($headers); > } >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/badlogin.php 2005-12-31 12:02:00.000000000 +0100 >+++ gui/tools/webmail/badlogin.php 2007-01-08 16:04:34.038119606 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -35,4 +35,4 @@ > $smarty->display("$selected_theme/bad-login.htm"); > > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/block_address.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/block_address.php 2007-01-08 16:07:10.033321560 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -78,4 +78,4 @@ > > $smarty->display("$selected_theme/block-address.htm"); > } >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/catch.php 2005-12-31 12:02:00.000000000 +0100 >+++ gui/tools/webmail/catch.php 2007-01-08 16:08:01.390486702 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -85,4 +85,4 @@ > } > $smarty->display("$selected_theme/catch-address.htm"); > } >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/database/_sessions/index.php 2005-12-31 12:01:19.000000000 +0100 >+++ gui/tools/webmail/database/_sessions/index.php 2007-01-08 16:09:01.629296894 +0100 >@@ -1,3 +1,3 @@ >-<? >+<?php > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/database/index.php 2005-12-31 12:01:19.000000000 +0100 >+++ gui/tools/webmail/database/index.php 2007-01-08 16:10:14.703149020 +0100 >@@ -1,3 +1,3 @@ >-<? >+<?php > Header("Location: ../"); >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/download.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/download.php 2007-01-08 16:11:07.488096345 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -46,4 +46,4 @@ > Header("Content-Disposition: $disposition; filename=\"".$attach["name"]."\"\r\n"); > > echo($stream); >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/folder_list.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/folder_list.php 2007-01-08 16:15:46.789487167 +0100 >@@ -1,36 +1,36 @@ >-<? >-$folders = $sess["folders"]; >+<?php >+$folders = $sess['folders']; > $scounter = 0; > $pcounter = 0; > foreach($folders as $entry) { >- $entry = $entry["name"]; >+ $entry = $entry['name']; > $boxname = $entry; >- if(in_array($entry, $sess["sysfolders"])) { >+ if(in_array($entry, $sess['sysfolders'])) { > switch(strtolower($entry)) { >- case strtolower($sess["sysmap"]["inbox"]): >+ case strtolower($sess['sysmap']['inbox']): > $boxname = $inbox_extended; > break; >- case strtolower($sess["sysmap"]["sent"]): >+ case strtolower($sess['sysmap']['sent']): > $boxname = $sent_extended; > break; >- case strtolower($sess["sysmap"]["trash"]): >+ case strtolower($sess['sysmap']['trash']): > $boxname = $trash_extended; > break; > } >- $system[$scounter]["systemname"] = $entry; >- $system[$scounter]["name"] = $boxname; >- $system[$scounter]["link"] = "process.php?folder=".$entry."&sid=$sid&tid=$tid&lid=$lid"; >+ $system[$scounter]['systemname'] = $entry; >+ $system[$scounter]['name'] = $boxname; >+ $system[$scounter]['link'] = "process.php?folder=".$entry."&sid=$sid&tid=$tid&lid=$lid"; > $scounter++; > } else { >- $personal[$pcounter]["systemname"] = $entry; >- $personal[$pcounter]["name"] = $boxname; >- $personal[$pcounter]["link"] = "process.php?folder=$entry&sid=$sid&tid=$tid&lid=$lid"; >+ $personal[$pcounter]['systemname'] = $entry; >+ $personal[$pcounter]['name'] = $boxname; >+ $personal[$pcounter]['link'] = "process.php?folder=$entry&sid=$sid&tid=$tid&lid=$lid"; > $pcounter++; > } > } >-array_qsort2 ($system,"name"); >-array_qsort2 ($personal,"name"); >+array_qsort2 ($system,'name'); >+array_qsort2 ($personal,'name'); > >-$smarty->assign("umSystemFolders",$system); >-$smarty->assign("umPersonalFolders",$personal); >-?> >\ No newline at end of file >+$smarty->assign('umSystemFolders',$system); >+$smarty->assign('umPersonalFolders',$personal); >+?> >--- gui/tools/webmail/folders.php 2005-12-31 12:01:57.000000000 +0100 >+++ gui/tools/webmail/folders.php 2007-01-08 16:16:44.000759228 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/get_message_list.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/get_message_list.php 2007-01-08 16:18:15.377819085 +0100 >@@ -1,15 +1,15 @@ >-<? >- $sess["last-update"] = time(); >+<?php >+ $sess['last-update'] = time(); > if($quota_limit) { > > for($n=0;$n<count($boxes);$n++) { >- $entry = $boxes[$n]["name"]; >- if(!array_key_exists(base64_encode($entry), $sess["headers"])) { >- $sess["headers"][base64_encode($entry)] = $UM->mail_list_msgs($entry); >+ $entry = $boxes[$n]['name']; >+ if(!array_key_exists(base64_encode($entry), $sess['headers'])) { >+ $sess['headers'][base64_encode($entry)] = $UM->mail_list_msgs($entry); > } > } > } else { >- $sess["headers"][$folder_key] = $UM->mail_list_msgs($folder); >+ $sess['headers'][$folder_key] = $UM->mail_list_msgs($folder); > } >- $headers = $sess["headers"][$folder_key]; >-?> >\ No newline at end of file >+ $headers = $sess['headers'][$folder_key]; >+?> >--- gui/tools/webmail/headers.php 2005-12-31 12:01:59.000000000 +0100 >+++ gui/tools/webmail/headers.php 2007-01-08 16:20:56.710206818 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -8,11 +8,11 @@ > Fell free to contact, send donations or anything to me :-) > S�o Paulo - Brasil > *************************************************************************/ >-require("./inc/inc.php"); >-if(!isset($folder) || !isset($ix)) die("Expected parameters"); >-$mail_info = $sess["headers"][base64_encode($folder)][$ix]; >-$smarty->assign("umPageTitle",$mail_info["subject"]); >-$smarty->assign("umHeaders",preg_replace("/\t/"," ",nl2br(htmlspecialchars($mail_info["header"])))); >-$smarty->display("$selected_theme/headers-window.htm"); >+require_once './inc/inc.php'; >+if(!isset($folder) || !isset($ix)) die('Expected parameters'); >+$mail_info = $sess['headers'][base64_encode($folder)][$ix]; >+$smarty->assign('umPageTitle',$mail_info['subject']); >+$smarty->assign('umHeaders',preg_replace("/\t/"," ",nl2br(htmlspecialchars($mail_info['header'])))); >+$smarty->display($selected_theme.'/headers-window.htm'); > > ?> >--- gui/tools/webmail/inc/class.uebimiau.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/class.uebimiau.php 2007-01-08 16:22:55.674058136 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -939,4 +939,4 @@ > } > } > require("./inc/class.uebimiau_mail.php"); >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/inc/class.uebimiau_mail.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/class.uebimiau_mail.php 2007-01-08 16:23:52.621370467 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > class UebiMiau extends UebiMiau_core { > > var $_current_folder = ""; >@@ -960,4 +960,4 @@ > > > } >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/inc/config.languages.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/config.languages.php 2007-01-08 16:24:57.354495023 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > $allow_user_change_theme = yes; > $default_theme = 'modern_blue'; > $allow_user_change_language = yes; >--- gui/tools/webmail/inc/config.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/config.php 2007-01-08 16:25:46.465002907 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/inc/config.security.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/config.security.php 2007-01-08 16:26:48.036609772 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > ######################################################################## > # Enable visualization of HTML messages > # *This option afect only incoming messages, the HTML editor >--- gui/tools/webmail/inc/lib.export.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/lib.export.php 2007-01-08 16:28:45.088752734 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > > /************************************************************************ > UebiMiau is a GPL'ed software developed by >@@ -89,4 +89,4 @@ > > > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/inc/lib.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/lib.php 2007-01-08 16:29:45.199582450 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -333,4 +333,4 @@ > > > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/logout.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/logout.php 2007-01-08 16:30:57.582539976 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > > /************************************************************************ > UebiMiau is a GPL'ed software developed by >@@ -69,4 +69,4 @@ > } > > redirect("./index.php"); >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/messages.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/messages.php 2007-01-08 16:32:01.600773593 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/newmsg.php 2005-12-31 12:01:57.000000000 +0100 >+++ gui/tools/webmail/newmsg.php 2007-01-08 16:33:11.155162635 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > > /************************************************************************ > UebiMiau is a GPL'ed software developed by >--- gui/tools/webmail/preferences.php 2005-12-31 12:01:59.000000000 +0100 >+++ gui/tools/webmail/preferences.php 2007-01-08 16:34:01.047551238 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -122,4 +122,4 @@ > > $smarty->display("$selected_theme/preferences.htm"); > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/printmsg.php 2005-12-31 12:01:59.000000000 +0100 >+++ gui/tools/webmail/printmsg.php 2007-01-08 16:35:52.840496523 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -103,4 +103,4 @@ > > $smarty->display("$selected_theme/print-message.htm"); > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/process.php 2005-12-31 12:01:59.000000000 +0100 >+++ gui/tools/webmail/process.php 2007-01-08 16:36:41.039143518 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/quick_address.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/quick_address.php 2007-01-08 16:38:03.090626049 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -29,4 +29,4 @@ > $smarty->assign("umContacts",$listbox); > $smarty->display("$selected_theme/quick_address.htm"); > >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/readmsg.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/readmsg.php 2007-01-08 16:38:55.674604034 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/redir.php 2005-12-31 12:01:57.000000000 +0100 >+++ gui/tools/webmail/redir.php 2007-01-08 16:39:57.198218221 +0100 >@@ -1,5 +1,5 @@ > <html> >-<? >+<?php > extract($_SERVER); > ?> > <head> >@@ -10,4 +10,4 @@ > <a href="<?=$QUERY_STRING?>"><?=$QUERY_STRING?></a> > </blockquote> > >-</html> >\ No newline at end of file >+</html> >--- gui/tools/webmail/search.php 2005-12-31 12:01:57.000000000 +0100 >+++ gui/tools/webmail/search.php 2007-01-08 16:41:14.099486450 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/show_body.php 2005-12-31 12:01:58.000000000 +0100 >+++ gui/tools/webmail/show_body.php 2007-01-08 16:42:27.709256818 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -9,9 +9,9 @@ > S�o Paulo - Brasil > *************************************************************************/ > >-require("./inc/inc.php"); >-if(!isset($folder) || !isset($ix)) die("Expected parameters"); >+require_once './inc/inc.php'; >+if(!isset($folder) || !isset($ix)) die('Expected parameters'); > echo($nocache); >-$body = $sess["currentbody"]; >+$body = $sess['currentbod']; > echo($body); > ?> >--- gui/tools/webmail/upload.php 2005-12-31 12:02:00.000000000 +0100 >+++ gui/tools/webmail/upload.php 2007-01-08 16:43:57.294590014 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >--- gui/tools/webmail/smarty/plugins/function.um_welcome_message.php 2005-12-31 12:01:45.000000000 +0100 >+++ gui/tools/webmail/smarty/plugins/function.um_welcome_message.php 2007-01-08 16:45:05.855130674 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /*======================================================================*\ > Function: smarty_func_um_welcome_message > Purpose: translate system boxes into different languages >@@ -57,4 +57,4 @@ > $smarty_obj->assign($var, $wlcmessage); > return; > } >-?> >\ No newline at end of file >+?> >--- gui/tools/webmail/inc/inc.php 2005-12-31 12:01:55.000000000 +0100 >+++ gui/tools/webmail/inc/inc.php 2007-01-08 16:52:22.576506090 +0100 >@@ -1,4 +1,4 @@ >-<? >+<?php > /************************************************************************ > UebiMiau is a GPL'ed software developed by > >@@ -150,9 +150,9 @@ > Don't remove the fallowing lines, or you will be problems with browser's cache > */ > >-Header("Expires: Wed, 11 Nov 1998 11:11:11 GMT\r\n". >-"Cache-Control: no-cache\r\n". >-"Cache-Control: must-revalidate"); >+Header('Expires: Wed, 11 Nov 1998 11:11:11 GMT'); >+Header('Cache-Control: no-cache'); >+Header('Cache-Control: must-revalidate', false); > > $nocache = " > <META HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\"> >--- gui/tools/filemanager/login.php 2005-12-31 12:02:34.000000000 +0100 >+++ gui/tools/filemanager/login.php 2007-01-08 17:04:20.456988921 +0100 >@@ -43,8 +43,13 @@ > $tp = fopen( "themes/" . $default_theme . ".thm", 'r' ); > $theme = load_theme( $tp ); > fclose ($tp); >- } >- $style = build_style_sheet( $theme ); >+ } >+ >+// FIX: suppress PHP warning about not existing variable $theme >+ if (isset($theme)) { >+ $style = build_style_sheet( $theme ); >+ } >+// FIX > > if (!isset($ERROR) ) $ERROR = 0; > ?>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 77651
:
89136
|
89137
|
89138
|
89139
|
89140
|
89141
|
89142
|
89143
|
89153
|
89154
|
89156
|
89157
|
89159
|
89160
|
111559
|
111561
|
111562
|
111564
| 111566 |
111567
|
111568
|
111570
|
111572
|
111574
|
221047