Skip to content

Commit

Permalink
fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@vivekshekar
vivekshekar committed Jan 8, 2014
2 parents f7e9642 + 1622377 commit 905b824
Show file tree
Hide file tree
Showing 105 changed files with 13,346 additions and 614 deletions.
26 changes: 26 additions & 0 deletions .htaccess
View file
@@ -0,0 +1,26 @@
## Ofuz rewrites
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteBase /
RewriteRule ^Contact/([0-9].*) /contact.php?id=$1
RewriteRule ^Company/([0-9].*) /company.php?id=$1
RewriteRule ^Project/([0-9].*) /project.php?idproject=$1
RewriteRule ^Task/([0-9].*) /task.php?idprojecttask=$1
RewriteRule ^cp/([0-9].*) /contact_portal.php?pc=$1
RewriteRule ^unsub/([0-9].+)/([0-9].*) /unsubscribe_email.php?idc=$1&idu=$2
RewriteRule ^arunsub/([0-9].+)/([0-9].+)/([0-9].*) /unsubscribe_auto_responder.php?idc=$1&idu=$2&idt=$3 [L]
RewriteRule ^form/([0-9].*) /web_form.php?fid=$1
RewriteRule ^inv/(.*)/(.*)$ /invoice_view.php?idinv=$1&idcon=$2
RewriteRule ^pay/(.*)/(.*)$ /invoice_pay_redirect.php?idinv=$1&idcon=$2
RewriteRule ^Invoice/(.*)$ /invoice.php?idinvoice=$1
RewriteRule ^PublicProject/([0-9].*) /public_project.php?idproject=$1
RewriteRule ^PublicTask/([0-9].*) /public_task.php?idprojecttask=$1
RewriteRule ^profile/(.*)$ /public_profile.php?u=$1 [L]
RewriteRule ^Tab/(.*)/(.*)/([0-9].*)$ /tab_display.php?plugin=$1&content=$2&item_value=$3
RewriteRule ^Tab/(.*)/(.*)$ /tab_display.php?plugin=$1&content=$2 [L]
RewriteRule ^PlugIn/(.*)/(.*)/([0-9].*)$ /tab_display.php?plugin=$1&content=$2&item_value=$3
RewriteRule ^PlugIn/(.*)/(.*)$ /tab_display.php?plugin=$1&content=$2 [L]
RewriteRule ^Setting/(.*)/(.*)$ /tab_setting_display.php?plugin=$1&setting=$2 [L]
RewriteRule ^Commitlog/(.*)/(.*)/(.*)/(.*)$ /tab_setting_display.php?plugin=$1&setting=$2&repo_name=$3&commithash=$4 [L]
</ifModule>
php_value include_path ".:/var/www/ofuzlib:/var/www/ofuz"
1 change: 1 addition & 0 deletions Zend
View file
@@ -0,0 +1 @@
../ofuzlibs/Zend
21 changes: 8 additions & 13 deletions ajx_public_profile_loader.php
View file
Expand Up @@ -125,32 +125,27 @@

$profile_html .= '<div class="profile_web_layout_main">';
$profile_html .= '<div class="profile_web_layout_inner">';
$profile_html .= '<div class="profile_web_layout_photo_block">';
$profile_html .= '<div class="profile_web_layout_photo_block cf">';

$profile_html .= '<div class="profile_web_layout_photo_left">';
$profile_html .= '<div class="profile_photo">';
if ($_SESSION['do_contact']->picture != '') {
$profile_html .= '<img src="'.$_SESSION['do_contact']->getContactPicture().'" height="120px" width="120px" alt="" />';
} else {
$profile_html .= '<img src="/images/empty_avatar.gif" height="100%" width = 100% alt="" />';
}
$profile_html .= '</div>';
$profile_html .= '</div>';

$profile_html .= '<div class="profile_web_layout_photo_right">';
$profile_html .= '<div class="profile_name">';
$profile_html .= '<div style="position:relative;float:left;width:70%;">'.$_SESSION['do_contact']->firstname.' '.$_SESSION['do_contact']->lastname.'</div>';
$profile_html .= '<div style="position:relative;float:right;width:15%;font-size:12px;"><a href="/public_profile_vcard.php"><img src="/images/get_vcard.png" width="91" height="26" alt="" /></a></div>';
$profile_html .= '<div style="position:relative;float:right;width:15%;">';
$profile_html .= '<div class="profile_name">'.$_SESSION['do_contact']->firstname.' '.$_SESSION['do_contact']->lastname.'<br />';
$profile_html .= '<div class="profile_title">'.$_SESSION['do_contact']->position.' at <span class="profile_company">'.$_SESSION['do_contact']->company.'</span></div>';
$profile_html .= '</div>';
$profile_html .= '<div class="contact_button"><a href="/public_profile_vcard.php"><img src="/images/get_vcard.png" width="91" height="26" alt="" /></a></div>';
$profile_html .= '<div class="contact_button">';
$profile_html .= '<form method="post" action="/public_profile.php">';
$profile_html .= '<input class="profile_button" type="image" src="/images/profile_add_to_ofuz.png" alt="Add the contact to Ofuz" name="add_cont" />';
$profile_html .= '<input type="image" src="/images/profile_add_to_ofuz.png" alt="Add the contact to Ofuz" name="add_cont" />';
$profile_html .= '<input type="hidden" name="hd_add_cont" value="1" />';
$profile_html .= '</form>';
$profile_html .= '</div>';
$profile_html .= '</div>';

$profile_html .= '<div style="clear:both;"></div>';
$profile_html .= '<div class="profile_title">'.$_SESSION['do_contact']->position.' at <span class="profile_company">'.$_SESSION['do_contact']->company.'</span></div>';

//$profile_html .= '<div style="vertical-align:right;"><input class="profile_button" type="image" src="/images/profile_add_to_ofuz.png" alt="Add the contact to Ofuz" name="add_cont" /></div>';
$profile_html .= '</div>';
$profile_html .= '</div>';
Expand Down
8 changes: 4 additions & 4 deletions api_upgrade_invoice.php
View file
Expand Up @@ -4,7 +4,7 @@
include_once("class/OfuzApiMethods.class.php");
include_once("class/OfuzApiClient.class.php");

$api_key = '23ac6be1febf5975f712ed144006f5a2';// replace this with your API key
$api_key = 'f1976041736ccb95fbb322e1e5c07cbf';// replace this with your API key



Expand All @@ -30,9 +30,9 @@
}


$do_ofuz = new OfuzApiClient();
$iduser = $do_ofuz->setAuth($api_key);
$do_ofuz->format = "php";// json,xml,php
$do_ofuz = new OfuzApiClient($api_key,'php');
// $iduser = $do_ofuz->setAuth($api_key);
// $do_ofuz->format = "php";// json,xml,php

$do_ofuz->firstname = $_SESSION['do_User']->firstname;
$do_ofuz->lastname = $_SESSION['do_User']->lastname;
Expand Down
30 changes: 30 additions & 0 deletions class/CcDetails.class.php
View file
@@ -0,0 +1,30 @@
<?php
/** Ofuz Open Source version is released under the GNU Affero General Public License, please read the full license at: http://www.gnu.org/licenses/agpl-3.0.html
* Copyright 2008 - 2010 all rights reserved, SQLFusion LLC, info@sqlfusion.com
* Ofuz Open Source version is released under the GNU Affero General Public License, please read the full license at: http://www.gnu.org/licenses/agpl-3.0.html
Table Name :cc_details;
+--------------+--------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+--------------+--------------+------+-----+---------+----------------+
| idcc_details | int(50) | NO | PRI | NULL | auto_increment |
| iduser | int(50) | NO | | NULL | |
| token | varchar(100) | NO | | NULL | |
| type | varchar(10) | NO | | NULL | |
+--------------+--------------+------+-----+---------+----------------+
***/


class CcDetails extends DataObject {


public $table = "cc_details";
protected $primary_key = "idcc_details";






}
70 changes: 41 additions & 29 deletions class/Contact.class.php
View file
Expand Up @@ -46,21 +46,28 @@ class Contact extends DataObject {
public $sql_qry_end = 50;
private $last_message_send = false;

function __construct(sqlConnect $conx=NULL, $table_name="") {
parent::__construct($conx, $table_name);
if (RADRIA_LOG_RUN_OFUZ) {
$this->setLogRun(OFUZ_LOG_RUN_CONTACT);
}
if (isset($_SESSION['contact_view_name'])) {
$this->sql_view_name = $_SESSION['contact_view_name'];
} else {
if (isset($_SESSION['do_User'])) {
$this->sql_view_name = "userid".$_SESSION['do_User']->iduser."_contact";
}
}
$this->setLog("\n Contact Object instantiated");
}




function __construct(sqlConnect $conx=NULL, $table_name="",$iduser = '') {
parent::__construct($conx, $table_name);
if (RADRIA_LOG_RUN_OFUZ) {
$this->setLogRun(OFUZ_LOG_RUN_CONTACT);
}

if(empty($iduser)){
$iduser = $_SESSION['do_User']->iduser;
}

if (isset($_SESSION['contact_view_name'])) {
$this->sql_view_name = $_SESSION['contact_view_name'];
}else{
if (isset($_SESSION['do_User'])) {
$this->sql_view_name = "userid".$iduser."_contact";
}
}
$this->setLog("\n Contact Object instantiated");
}

/**
* getSqlViewName()
Expand Down Expand Up @@ -990,21 +997,26 @@ function eventDeleteMultiple(EventControler $event_controler) {
$error_delete = false;
$do_deleting_contact = new Contact();
$logged_in_useridcontact = $_SESSION['do_User']->idcontact;
$count_contact = 0;
foreach ($contacts as $idcontact) {
$this->setLog("\n deleting contact:".$idcontact);
$do_deleting_contact->getId($idcontact);
if($this->isContactOwner($idcontact)){ // if owner then only delete
if($idcontact != $logged_in_useridcontact){
$do_deleting_contact->delete();
}else{
$error_message = 'You can not delete your own contact.<br />';
$error_delete = true;
}
}else{
$error_message = "The following Contacts can not be deleted as these are shared by some of your Co-Workers.<br />";
$error_message .= '<b><i>'.$this->getContactFullName($idcontact).'</i></b><br />';
$error_delete = true;
}
$count_contact++;
//Delete only 50 contacts at a time.
if($count_contact <= 50) {
$this->setLog("\n deleting contact:".$idcontact);
$do_deleting_contact->getId($idcontact);
if($this->isContactOwner($idcontact)){ // if owner then only delete
if($idcontact != $logged_in_useridcontact){
$do_deleting_contact->delete();
}else{
$error_message = 'You can not delete your own contact.<br />';
$error_delete = true;
}
}else{
$error_message = "The following Contacts can not be deleted as these are shared by some of your Co-Workers.<br />";
$error_message .= '<b><i>'.$this->getContactFullName($idcontact).'</i></b><br />';
$error_delete = true;
}
}
}
$do_deleting_contact->free();
// When deleting contact by uisng search by tag and if all the contacts are deleted then we must set the query as empty
Expand Down

0 comments on commit 905b824

Please sign in to comment.